projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cae89a7
)
support older gcc versions
author
berak
<px1704@web.de>
Sun, 2 Nov 2014 07:16:29 +0000
(08:16 +0100)
committer
berak
<px1704@web.de>
Sun, 2 Nov 2014 07:16:29 +0000
(08:16 +0100)
modules/core/include/opencv2/core/base.hpp
patch
|
blob
|
history
diff --git
a/modules/core/include/opencv2/core/base.hpp
b/modules/core/include/opencv2/core/base.hpp
index
e17cb84
..
77c5c52
100644
(file)
--- a/
modules/core/include/opencv2/core/base.hpp
+++ b/
modules/core/include/opencv2/core/base.hpp
@@
-225,7
+225,7
@@
enum {
CV_DO_PRAGMA(warning(push)) \
CV_DO_PRAGMA(warning(disable: 4996))
#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 \
CV_DO_PRAGMA(GCC diagnostic push) \
CV_DO_PRAGMA(GCC diagnostic ignored "-Wdeprecated-declarations")