generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-04-28 02:33:32 +02:00
Code Issues Projects Releases Wiki Activity

added conditional C++11 definitions to match visual studio 2015

Browse Source
This commit is contained in:
Philip Top 2016-10-22 06:24:35 -07:00
parent 0791496622
commit a3f166e5cd
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zmq.hpp
View File

@ -25,10 +25,14 @@
#ifndef __ZMQ_HPP_INCLUDED__ #ifndef __ZMQ_HPP_INCLUDED__
#define __ZMQ_HPP_INCLUDED__ #define __ZMQ_HPP_INCLUDED__
#if __cplusplus >= 201103L #if (__cplusplus >= 201103L)
#define ZMQ_CPP11 #define ZMQ_CPP11
#define ZMQ_NOTHROW noexcept #define ZMQ_NOTHROW noexcept
#define ZMQ_EXPLICIT explicit #define ZMQ_EXPLICIT explicit
#elif (defined(_MSC_VER) && (_MSC_VER >= 1900))
#define ZMQ_CPP11
#define ZMQ_NOTHROW noexcept
#define ZMQ_EXPLICIT explicit
#else #else
#define ZMQ_CPP03 #define ZMQ_CPP03
#define ZMQ_NOTHROW #define ZMQ_NOTHROW
@ -66,6 +70,9 @@
#else #else
#define ZMQ_DELETED_FUNCTION #define ZMQ_DELETED_FUNCTION
#endif #endif
#elif defined(_MSC_VER) && (_MSC_VER >= 1900)
#define ZMQ_HAS_RVALUE_REFS
#define ZMQ_DELETED_FUNCTION = delete
#elif defined(_MSC_VER) && (_MSC_VER >= 1600) #elif defined(_MSC_VER) && (_MSC_VER >= 1600)
#define ZMQ_HAS_RVALUE_REFS #define ZMQ_HAS_RVALUE_REFS
#define ZMQ_DELETED_FUNCTION #define ZMQ_DELETED_FUNCTION
@ -111,12 +118,17 @@ namespace zmq
public: public:
error_t () : errnum (zmq_errno ()) {} error_t () : errnum (zmq_errno ()) {}
#ifdef ZMQ_CPP11
virtual const char *what () const throw () virtual const char *what () noexcept
{ {
return zmq_strerror (errnum); return zmq_strerror (errnum);
} }
#else
virtual const char *what() const throw ()
{
return zmq_strerror(errnum);
}
#endif
int num () const int num () const
{ {
return errnum; return errnum;