removing SuppressWarning and CV_OPENCL_RUN

This commit is contained in:
Andrey Pavlenko
2014-04-03 11:26:25 +04:00
parent 3578f0afe9
commit 925178749a
2 changed files with 10 additions and 16 deletions

View File

@@ -495,11 +495,6 @@ template<> inline std::string CommandLineParser::get<std::string>(const String&
}
#endif // OPENCV_NOSTL
#if !defined(OPENCV_SKIP_SUPPRESS_WARNING) || !OPENCV_SKIP_SUPPRESS_WARNING
// Use this to bypass "warning C4127: conditional expression is constant"
template <typename T> T SuppressWarning(T v) { return v; }
#endif
} //namespace cv
#endif //__OPENCV_CORE_UTILITY_H__