generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3373 from berak:patch-2

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-11-05 11:14:59 +00:00
commit 72419c3778
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/base.hpp
View File

@ -225,7 +225,7 @@ enum {
CV_DO_PRAGMA(warning(push)) \ CV_DO_PRAGMA(warning(push)) \
CV_DO_PRAGMA(warning(disable: 4996)) CV_DO_PRAGMA(warning(disable: 4996))
#define CV_SUPPRESS_DEPRECATED_END CV_DO_PRAGMA(warning(pop)) #define CV_SUPPRESS_DEPRECATED_END CV_DO_PRAGMA(warning(pop))
#elif defined __GNUC__ #elif defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
#define CV_SUPPRESS_DEPRECATED_START \ #define CV_SUPPRESS_DEPRECATED_START \
CV_DO_PRAGMA(GCC diagnostic push) \ CV_DO_PRAGMA(GCC diagnostic push) \
CV_DO_PRAGMA(GCC diagnostic ignored "-Wdeprecated-declarations") CV_DO_PRAGMA(GCC diagnostic ignored "-Wdeprecated-declarations")