Merge pull request #553 from gin-ahirsch/gcc-non14-constexpr

Suppress ZMQ_EXTENDED_CONSTEXPR on gcc with partial C++14 support
zeromq · May 10, 2022 · 2636233 · 2636233
2 parents a98fa4a + b9f6e06
commit 2636233
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/zmq.hpp b/zmq.hpp
@@ -94,7 +94,7 @@
 #define ZMQ_CONSTEXPR_VAR const
 #define ZMQ_CPP11_DEPRECATED(msg)
 #endif
-#if defined(ZMQ_CPP14) && (!defined(_MSC_VER) || _MSC_VER > 1900)
+#if defined(ZMQ_CPP14) && (!defined(_MSC_VER) || _MSC_VER > 1900) && (!defined(__GNUC__) || __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3))
 #define ZMQ_EXTENDED_CONSTEXPR
 #endif
 #if defined(ZMQ_CPP17)