From c577c2cc6a997710c833164e2b5a41a2a14bebe5 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.alekhin@intel.com>
Date: Mon, 3 Dec 2018 15:19:48 +0300
Subject: [PATCH] gapi: eliminate KW issues

---
 modules/gapi/include/opencv2/gapi/own/assert.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gapi/include/opencv2/gapi/own/assert.hpp b/modules/gapi/include/opencv2/gapi/own/assert.hpp
index 8d3feff011..10ec240b51 100644
--- a/modules/gapi/include/opencv2/gapi/own/assert.hpp
+++ b/modules/gapi/include/opencv2/gapi/own/assert.hpp
@@ -10,7 +10,8 @@
 
 #if !defined(GAPI_STANDALONE)
 #include <opencv2/core/base.hpp>
-#define GAPI_Assert(expr) CV_Assert(expr)
+#define GAPI_Assert CV_Assert
+#define GAPI_DbgAssert CV_DbgAssert
 
 #else
 #include <stdexcept>
@@ -30,7 +31,6 @@ namespace detail
 #define GAPI_Assert(expr) \
 { if (!(expr)) ::detail::assert_abort(#expr, __LINE__, __FILE__, __func__); }
 
-#endif
 
 #ifdef NDEBUG
 #  define GAPI_DbgAssert(expr)
@@ -38,4 +38,6 @@ namespace detail
 #  define GAPI_DbgAssert(expr) GAPI_Assert(expr)
 #endif
 
+#endif // GAPI_STANDALONE
+
 #endif // OPENCV_GAPI_OWN_ASSERT_HPP