From 267c5a747b5c23f3c0a41d72146aa4d730c52531 Mon Sep 17 00:00:00 2001
From: Tomoaki Teshima <tomoaki.teshima@gmail.com>
Date: Wed, 13 Dec 2017 15:07:51 +0900
Subject: [PATCH] suppress warnings on OpenCL build   * stop re-enabling the
 warning C4127   * disabling is done in CMakeLists.txt

---
 modules/core/src/ocl.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
index a98a540d2a..15a218056d 100644
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -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