Skip to content

Commit 267c5a7

Browse files
committed
suppress warnings on OpenCL build
* stop re-enabling the warning C4127 * disabling is done in CMakeLists.txt
1 parent b0bce60 commit 267c5a7

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

modules/core/src/ocl.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4339,9 +4339,6 @@ class OpenCLSVMBufferPoolImpl : public OpenCLBufferPoolBaseImpl<OpenCLSVMBufferP
43394339

43404340

43414341

4342-
#if defined _MSC_VER
4343-
#pragma warning(disable:4127) // conditional expression is constant
4344-
#endif
43454342
template <bool readAccess, bool writeAccess>
43464343
class AlignedDataPtr
43474344
{
@@ -4446,9 +4443,6 @@ class AlignedDataPtr2D
44464443
AlignedDataPtr2D(const AlignedDataPtr2D&); // disabled
44474444
AlignedDataPtr2D& operator=(const AlignedDataPtr2D&); // disabled
44484445
};
4449-
#if defined _MSC_VER
4450-
#pragma warning(default:4127) // conditional expression is constant
4451-
#endif
44524446

44534447
#ifndef CV_OPENCL_DATA_PTR_ALIGNMENT
44544448
#define CV_OPENCL_DATA_PTR_ALIGNMENT 16

0 commit comments

Comments
 (0)