Skip to content

Commit 576a853

Browse files
committed
Merge pull request opencv#9582 from sovrasov:fix_gcc7_macro_warning
2 parents f8598e1 + eeba5c3 commit 576a853

File tree

1 file changed

+1
-1
lines changed
  • modules/core/include/opencv2/core

1 file changed

+1
-1
lines changed

modules/core/include/opencv2/core/base.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ configurations while CV_DbgAssert is only retained in the Debug configuration.
426426
*/
427427

428428
#define CV_VA_NUM_ARGS_HELPER(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
429-
#define CV_VA_NUM_ARGS(...) CV_VA_NUM_ARGS_HELPER(__VA_ARGS__, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1)
429+
#define CV_VA_NUM_ARGS(...) CV_VA_NUM_ARGS_HELPER(__VA_ARGS__, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
430430

431431
#define CV_Assert_1( expr ) if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ )
432432
#define CV_Assert_2( expr1, expr2 ) CV_Assert_1(expr1); CV_Assert_1(expr2)

0 commit comments

Comments
 (0)