Ticket #55641: patch-zmq-use-have-cxx11.diff

File patch-zmq-use-have-cxx11.diff, 1.7 KB (added by kencu (Ken), 7 years ago)

  • src/atomic_counter.hpp 

    diff --git src/atomic_counter.hpp src/atomic_counter.hpp
index 23a7c50..d9b183d 100644
     
    3636#define ZMQ_ATOMIC_COUNTER_MUTEX
    3737#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
    3838#define ZMQ_ATOMIC_COUNTER_INTRINSIC
    39 #elif (defined __cplusplus && __cplusplus >= 201103L)
     39#elif (defined __cplusplus && HAVE_CXX11)
    4040#define ZMQ_ATOMIC_COUNTER_CXX11
    4141#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
    4242#define ZMQ_ATOMIC_COUNTER_X86

  • src/atomic_ptr.hpp 

    diff --git src/atomic_ptr.hpp src/atomic_ptr.hpp
index 53b0d5d..011009e 100644
     
    3434#define ZMQ_ATOMIC_PTR_MUTEX
    3535#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
    3636#define ZMQ_ATOMIC_PTR_INTRINSIC
    37 #elif (defined __cplusplus && __cplusplus >= 201103L)
     37#elif (defined __cplusplus && HAVE_CXX11)
    3838#define ZMQ_ATOMIC_PTR_CXX11
    3939#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
    4040#define ZMQ_ATOMIC_PTR_X86

  • src/blob.hpp 

    diff --git src/blob.hpp src/blob.hpp
index 9e21718..97d7505 100644
     
    3434#include <string.h>
    3535#include <algorithm>
    3636
    37 #if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER >= 1700
     37#if HAVE_CXX11 || defined(_MSC_VER) && _MSC_VER >= 1700
    3838#define ZMQ_HAS_MOVE_SEMANTICS
    3939#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k,v)
    4040#define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back

  • src/condition_variable.hpp 

    diff --git src/condition_variable.hpp src/condition_variable.hpp
index 6452b78..c527b48 100644
     
    4646#define _SUPPORT_CONDITION_VARIABLE 0
    4747#endif
    4848#else
    49 #if _cplusplus >= 201103L
     49#if HAVE_CXX11
    5050#define _SUPPORT_CONDITION_VARIABLE 1
    5151#else
    5252#define _SUPPORT_CONDITION_VARIABLE 0