Skip to content

O
opencv
Commit 2dc5e245 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #13350 from alalek:fix_kw_gapi

parents ea3a5950 c577c2cc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
modules/gapi/include/opencv2/gapi/own/assert.hpp
View file @ 2dc5e245
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
#if !defined(GAPI_STANDALONE) #if !defined(GAPI_STANDALONE)
#include <opencv2/core/base.hpp> #include <opencv2/core/base.hpp>
#define GAPI_Assert(expr) CV_Assert(expr) #define GAPI_Assert CV_Assert
#define GAPI_DbgAssert CV_DbgAssert
#else #else
#include <stdexcept> #include <stdexcept>
...@@ -30,7 +31,6 @@ namespace detail ...@@ -30,7 +31,6 @@ namespace detail
#define GAPI_Assert(expr) \ #define GAPI_Assert(expr) \
{ if (!(expr)) ::detail::assert_abort(#expr, __LINE__, __FILE__, __func__); } { if (!(expr)) ::detail::assert_abort(#expr, __LINE__, __FILE__, __func__); }
#endif
#ifdef NDEBUG #ifdef NDEBUG
# define GAPI_DbgAssert(expr) # define GAPI_DbgAssert(expr)
...@@ -38,4 +38,6 @@ namespace detail ...@@ -38,4 +38,6 @@ namespace detail
# define GAPI_DbgAssert(expr) GAPI_Assert(expr) # define GAPI_DbgAssert(expr) GAPI_Assert(expr)
#endif #endif
#endif // GAPI_STANDALONE
#endif // OPENCV_GAPI_OWN_ASSERT_HPP #endif // OPENCV_GAPI_OWN_ASSERT_HPP
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