From 534007377061dd97e475e278ab27a407c12c4c66 Mon Sep 17 00:00:00 2001
From: Ruslan Garnov <ruslan.garnov@intel.com>
Date: Thu, 13 Dec 2018 14:36:15 +0300
Subject: [PATCH] Removed UNUSED macro

---
 modules/gapi/include/opencv2/gapi/util/compiler_hints.hpp | 2 --
 modules/gapi/src/backends/fluid/gfluidcore.cpp            | 4 ++--
 modules/gapi/src/backends/fluid/gfluidutils.hpp           | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/gapi/include/opencv2/gapi/util/compiler_hints.hpp b/modules/gapi/include/opencv2/gapi/util/compiler_hints.hpp
index 575655e8fb..a41a97145d 100644
--- a/modules/gapi/include/opencv2/gapi/util/compiler_hints.hpp
+++ b/modules/gapi/include/opencv2/gapi/util/compiler_hints.hpp
@@ -16,6 +16,4 @@ namespace util
 } // namespace util
 } // namespace cv
 
-#define UNUSED(x) cv::util::suppress_unused_warning(x)
-
 #endif /* OPENCV_GAPI_UTIL_COMPILER_HINTS_HPP */
diff --git a/modules/gapi/src/backends/fluid/gfluidcore.cpp b/modules/gapi/src/backends/fluid/gfluidcore.cpp
index 16a63e2174..b58ec0765c 100644
--- a/modules/gapi/src/backends/fluid/gfluidcore.cpp
+++ b/modules/gapi/src/backends/fluid/gfluidcore.cpp
@@ -340,7 +340,7 @@ static void run_arithm_s3(uchar out[], const uchar in[], int width, const uchar
         v_store_interleave(&out[3*w], x, y, z);
     }
 #endif
-    UNUSED(v_op);
+    cv::util::suppress_unused_warning(v_op);
     for (; w < width; w++)
     {
         out[3*w    ] = saturate<uchar>( s_op(in[3*w    ], scalar[0]) );
@@ -386,7 +386,7 @@ static void run_arithm_s1(uchar out[], const float in[], int width, const float
         v_store(&out[w], uc);
     }
 #endif
-    UNUSED(v_op);
+    cv::util::suppress_unused_warning(v_op);
     for (; w < width; w++)
     {
         out[w] = saturate<uchar>(s_op(in[w], scalar[0]), std::roundf);
diff --git a/modules/gapi/src/backends/fluid/gfluidutils.hpp b/modules/gapi/src/backends/fluid/gfluidutils.hpp
index a38b2f132e..fa15ee9e62 100644
--- a/modules/gapi/src/backends/fluid/gfluidutils.hpp
+++ b/modules/gapi/src/backends/fluid/gfluidutils.hpp
@@ -10,7 +10,7 @@
 
 #include <limits>
 #include <type_traits>
-#include <opencv2/gapi/util/compiler_hints.hpp> //UNUSED
+#include <opencv2/gapi/util/compiler_hints.hpp> //suppress_unused_warning
 #include <opencv2/gapi/own/saturate.hpp>
 
 namespace cv {