Skip to content

O
opencv
Commit 84ee4d70 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #10297 from tomoaki0705:suppressOclWarning

parents ce20efb8 267c5a74
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
modules/core/src/ocl.cpp
View file @ 84ee4d70
...@@ -4339,9 +4339,6 @@ public: ...@@ -4339,9 +4339,6 @@ public:
#if defined _MSC_VER
#pragma warning(disable:4127) // conditional expression is constant
#endif
template <bool readAccess, bool writeAccess> template <bool readAccess, bool writeAccess>
class AlignedDataPtr class AlignedDataPtr
{ {
...@@ -4446,9 +4443,6 @@ private: ...@@ -4446,9 +4443,6 @@ private:
AlignedDataPtr2D(const AlignedDataPtr2D&); // disabled AlignedDataPtr2D(const AlignedDataPtr2D&); // disabled
AlignedDataPtr2D& operator=(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 #ifndef CV_OPENCL_DATA_PTR_ALIGNMENT
#define CV_OPENCL_DATA_PTR_ALIGNMENT 16 #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