Merge pull request #11188 from mshabunin:fix-clang-warnings

This commit is contained in:
Alexander Alekhin
2018-03-29 14:34:30 +00:00
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -44,7 +44,7 @@
#include <memory>
#include <window_QT.h>
#include "window_QT.h"
#include <math.h>
+3
View File
@@ -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"