From 439072a2a62efdc664038383a03b96b4ea7d6d8d Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Thu, 29 Mar 2018 13:24:04 +0300 Subject: [PATCH] Fixed two warnings produced by clang --- modules/highgui/src/window_QT.cpp | 2 +- modules/ts/include/opencv2/ts.hpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp index 5faf530d33..9425c7be14 100644 --- a/modules/highgui/src/window_QT.cpp +++ b/modules/highgui/src/window_QT.cpp @@ -44,7 +44,7 @@ #include -#include +#include "window_QT.h" #include diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp index 5f0556b426..7b3f732ce0 100644 --- a/modules/ts/include/opencv2/ts.hpp +++ b/modules/ts/include/opencv2/ts.hpp @@ -63,6 +63,9 @@ # endif #endif +#if defined(__OPENCV_BUILD) && defined(__clang__) +#pragma clang diagnostic ignored "-Winconsistent-missing-override" +#endif #if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5 //#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wsuggest-override"