Skip to content

Commit 03243ad

Browse files
authored
Merge pull request #447 from SylvainCorlay/vs2015-syntax-error
Fix VS 2015 syntax error with macro
2 parents 07ac9fe + c34d8ea commit 03243ad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

zmq.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define ZMQ_CPP17
6262
#endif
6363

64-
#if defined(ZMQ_CPP14)
64+
#if defined(ZMQ_CPP14) && !defined(_MSC_VER)
6565
#define ZMQ_DEPRECATED(msg) [[deprecated(msg)]]
6666
#elif defined(_MSC_VER)
6767
#define ZMQ_DEPRECATED(msg) __declspec(deprecated(msg))

0 commit comments

Comments
 (0)