suppress warnings on OpenCL build
authorTomoaki Teshima <tomoaki.teshima@gmail.com>
Wed, 13 Dec 2017 06:07:51 +0000 (15:07 +0900)
committerTomoaki Teshima <tomoaki.teshima@gmail.com>
Wed, 13 Dec 2017 06:07:51 +0000 (15:07 +0900)
  * stop re-enabling the warning C4127
  * disabling is done in CMakeLists.txt

modules/core/src/ocl.cpp

index a98a540..15a2180 100644 (file)
@@ -4339,9 +4339,6 @@ public:
 
 
 
-#if defined _MSC_VER
-#pragma warning(disable:4127) // conditional expression is constant
-#endif
 template <bool readAccess, bool writeAccess>
 class AlignedDataPtr
 {
@@ -4446,9 +4443,6 @@ private:
     AlignedDataPtr2D(const AlignedDataPtr2D&); // disabled
     AlignedDataPtr2D& operator=(const AlignedDataPtr2D&); // disabled
 };
-#if defined _MSC_VER
-#pragma warning(default:4127) // conditional expression is constant
-#endif
 
 #ifndef CV_OPENCL_DATA_PTR_ALIGNMENT
 #define CV_OPENCL_DATA_PTR_ALIGNMENT 16