ocl: drop CV_OclDbgAssert

alalek · alalek · commit 9c4f0a984faf · 2017-11-03T13:31:37.000+03:00
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -105,9 +105,7 @@
 
 namespace cv { namespace ocl {
 
-#ifdef _DEBUG
-#define CV_OclDbgAssert CV_DbgAssert
-#else
+#ifndef _DEBUG
 static bool isRaiseError()
 {
     static bool initialized = false;
@@ -119,7 +117,6 @@ static bool isRaiseError()
     }
     return value;
 }
-#define CV_OclDbgAssert(expr) do { if (isRaiseError()) { CV_Assert(expr); } else { (void)(expr); } } while ((void)0, 0)
 #endif
 
 #if CV_OPENCL_TRACE_CHECK
@@ -2717,7 +2714,7 @@ struct Program::Impl
 
         handle = clCreateProgramWithSource((cl_context)ctx.ptr(), 1, &srcptr, &srclen, &retval);
         CV_OCL_DBG_CHECK_RESULT(retval, "clCreateProgramWithSource");
-        CV_OclDbgAssert(handle && retval == CL_SUCCESS);
+        CV_Assert(handle || retval != CL_SUCCESS);
         if (handle && retval == CL_SUCCESS)
         {
             int i, n = (int)ctx.ndevices();

Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,7 @@`
`105`	`105`
`106`	`106`	`namespace cv { namespace ocl {`
`107`	`107`
`108`		`-#ifdef _DEBUG`
`109`		`-#define CV_OclDbgAssert CV_DbgAssert`
`110`		`-#else`
	`108`	`+#ifndef _DEBUG`
`111`	`109`	`static bool isRaiseError()`
`112`	`110`	`{`
`113`	`111`	`static bool initialized = false;`
`@@ -119,7 +117,6 @@ static bool isRaiseError()`
`119`	`117`	`}`
`120`	`118`	`return value;`
`121`	`119`	`}`
`122`		`-#define CV_OclDbgAssert(expr) do { if (isRaiseError()) { CV_Assert(expr); } else { (void)(expr); } } while ((void)0, 0)`
`123`	`120`	`#endif`
`124`	`121`
`125`	`122`	`#if CV_OPENCL_TRACE_CHECK`
`@@ -2717,7 +2714,7 @@ struct Program::Impl`
`2717`	`2714`
`2718`	`2715`	`handle = clCreateProgramWithSource((cl_context)ctx.ptr(), 1, &srcptr, &srclen, &retval);`
`2719`	`2716`	`CV_OCL_DBG_CHECK_RESULT(retval, "clCreateProgramWithSource");`
`2720`		`- CV_OclDbgAssert(handle && retval == CL_SUCCESS);`
	`2717`	`+ CV_Assert(handle \|\| retval != CL_SUCCESS);`
`2721`	`2718`	`if (handle && retval == CL_SUCCESS)`
`2722`	`2719`	`{`
`2723`	`2720`	`int i, n = (int)ctx.ndevices();`