Commit 267c5a74 authored by Tomoaki Teshima's avatar Tomoaki Teshima

suppress warnings on OpenCL build

  * stop re-enabling the warning C4127
  * disabling is done in CMakeLists.txt
parent b0bce60c
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment