Fixed two warnings produced by clang

439072a2 · Maksim Shabunin · 7dc88f26 · 439072a2 · 439072a2
Commit 439072a2 authored Mar 29, 2018 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

window_QT.cpp modules/highgui/src/window_QT.cpp +1 -1

ts.hpp modules/ts/include/opencv2/ts.hpp +3 -0

No files found.
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -44,7 +44,7 @@

 #include <memory>

-#include <window_QT.h>
+#include "window_QT.h"

 #include <math.h>


--- 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"