mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-01 02:18:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10297 from tomoaki0705:suppressOclWarning

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-12-13 07:56:34 +00:00
commit 84ee4d701a
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/ocl.cpp
View File

@ -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:
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