mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 04:52:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-29 14:34:30 +00:00
commit 1b7aa92eb6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/src/window_QT.cpp
View File

@ -44,7 +44,7 @@
#include <memory> #include <memory>
#include <window_QT.h> #include "window_QT.h"
#include <math.h> #include <math.h>

3
modules/ts/include/opencv2/ts.hpp
View File

@ -63,6 +63,9 @@
# endif # endif
#endif #endif
#if defined(__OPENCV_BUILD) && defined(__clang__)
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
#endif
#if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5 #if defined(__OPENCV_BUILD) && defined(__GNUC__) && __GNUC__ >= 5
//#pragma GCC diagnostic push //#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override" #pragma GCC diagnostic ignored "-Wsuggest-override"