You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

92 lines
3.3 KiB

  1. --- a/perf/benchmark_radix_tree.cpp
  2. +++ b/perf/benchmark_radix_tree.cpp
  3. @@ -26,8 +26,8 @@
  4. You should have received a copy of the GNU Lesser General Public License
  5. along with this program. If not, see <http://www.gnu.org/licenses/>.
  6. */
  7. -
  8. -#if __cplusplus >= 201103L
  9. +#include <ios>
  10. +#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)
  11. #include "radix_tree.hpp"
  12. #include "trie.hpp"
  13. --- a/src/atomic_counter.hpp
  14. +++ b/src/atomic_counter.hpp
  15. @@ -35,7 +35,7 @@
  16. #if defined ZMQ_FORCE_MUTEXES
  17. #define ZMQ_ATOMIC_COUNTER_MUTEX
  18. -#elif (defined __cplusplus && __cplusplus >= 201103L) \
  19. +#elif (defined __cplusplus && __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)) \
  20. || (defined _MSC_VER && _MSC_VER >= 1900)
  21. #define ZMQ_ATOMIC_COUNTER_CXX11
  22. #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
  23. --- a/src/atomic_ptr.hpp
  24. +++ b/src/atomic_ptr.hpp
  25. @@ -34,7 +34,7 @@
  26. #if defined ZMQ_FORCE_MUTEXES
  27. #define ZMQ_ATOMIC_PTR_MUTEX
  28. -#elif (defined __cplusplus && __cplusplus >= 201103L) \
  29. +#elif (defined __cplusplus && __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__)) \
  30. || (defined _MSC_VER && _MSC_VER >= 1900)
  31. #define ZMQ_ATOMIC_PTR_CXX11
  32. #elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
  33. --- a/src/blob.hpp
  34. +++ b/src/blob.hpp
  35. @@ -38,7 +38,7 @@
  36. #include <algorithm>
  37. #include <ios>
  38. -#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700
  39. +#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) || defined(_MSC_VER) && _MSC_VER > 1700
  40. #define ZMQ_HAS_MOVE_SEMANTICS
  41. #define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
  42. #define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
  43. --- a/src/msg.hpp
  44. +++ b/src/msg.hpp
  45. @@ -30,8 +30,8 @@
  46. #ifndef __ZMQ_MSG_HPP_INCLUDE__
  47. #define __ZMQ_MSG_HPP_INCLUDE__
  48. -#include <stddef.h>
  49. -#include <stdio.h>
  50. +#include <cstddef>
  51. +#include <cstdio>
  52. #include "config.hpp"
  53. #include "err.hpp"
  54. --- a/src/options.hpp
  55. +++ b/src/options.hpp
  56. @@ -305,7 +305,7 @@ int do_getsockopt (void *const optval_,
  57. template <typename T>
  58. int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
  59. {
  60. -#if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ > 5)
  61. +#if __cplusplus >= 201103L && !defined(__UCLIBCXX_MAJOR__) && (!defined(__GNUC__) || __GNUC__ > 5)
  62. static_assert (std::is_trivially_copyable<T>::value,
  63. "invalid use of do_getsockopt");
  64. #endif
  65. --- a/src/ctx.cpp
  66. +++ b/src/ctx.cpp
  67. @@ -725,7 +725,7 @@ void zmq::ctx_t::unregister_endpoints (c
  68. end = _endpoints.end ();
  69. it != end;) {
  70. if (it->second.socket == socket_)
  71. -#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
  72. +#if (__cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)) && !defined(__UCLIBCXX_MAJOR__)
  73. it = _endpoints.erase (it);
  74. #else
  75. _endpoints.erase (it++);
  76. --- a/src/radio.cpp
  77. +++ b/src/radio.cpp
  78. @@ -126,7 +126,7 @@ void zmq::radio_t::xpipe_terminated (pip
  79. end = _subscriptions.end ();
  80. it != end;) {
  81. if (it->second == pipe_) {
  82. -#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
  83. +#if (__cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)) && !defined(__UCLIBCXX_MAJOR__)
  84. it = _subscriptions.erase (it);
  85. #else
  86. _subscriptions.erase (it++);