Skip to content

Commit 527a873

Browse files
authored
Merge pull request #339 from gummif/gfa/detect-14
Problem: C++14 features not detected using MSVC
2 parents 1f66e99 + e5f1a2d commit 527a873

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

zmq.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
#if (defined(__cplusplus) && __cplusplus >= 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1900)
3131
#define ZMQ_CPP11
3232
#endif
33-
#if (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
33+
#if (defined(__cplusplus) && __cplusplus >= 201402L) || \
34+
(defined(_HAS_CXX14) && _HAS_CXX14 == 1) || \
35+
(defined(_HAS_CXX17) && _HAS_CXX17 == 1) // _HAS_CXX14 might not be defined when using C++17 on MSVC
3436
#define ZMQ_CPP14
3537
#endif
3638
#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1)

0 commit comments

Comments
 (0)