Skip to content

Commit 2636233

Browse files
authored
Merge pull request #553 from gin-ahirsch/gcc-non14-constexpr
Suppress ZMQ_EXTENDED_CONSTEXPR on gcc with partial C++14 support
2 parents a98fa4a + b9f6e06 commit 2636233

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

zmq.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
#define ZMQ_CONSTEXPR_VAR const
9595
#define ZMQ_CPP11_DEPRECATED(msg)
9696
#endif
97-
#if defined(ZMQ_CPP14) && (!defined(_MSC_VER) || _MSC_VER > 1900)
97+
#if defined(ZMQ_CPP14) && (!defined(_MSC_VER) || _MSC_VER > 1900) && (!defined(__GNUC__) || __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3))
9898
#define ZMQ_EXTENDED_CONSTEXPR
9999
#endif
100100
#if defined(ZMQ_CPP17)

0 commit comments

Comments
 (0)