From ae8efc21e8fc8db031d151e4ddc306344f7e8928 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 21 Feb 2016 23:53:59 +0000 Subject: [PATCH] Problem: nullptr is a reserved keyword in C++0x Solution: use NULL instead to avoid build failure with older compilers. --- src/encoder.hpp | 2 +- src/socket_base.cpp | 2 +- src/thread.hpp | 4 ++-- src/udp_engine.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/encoder.hpp b/src/encoder.hpp index 1a5870e7..741b72be 100644 --- a/src/encoder.hpp +++ b/src/encoder.hpp @@ -59,7 +59,7 @@ namespace zmq inline encoder_base_t (size_t bufsize_) : write_pos(0), to_write(0), - next(nullptr), + next(NULL), new_msg_flag(false), bufsize (bufsize_), in_progress (NULL) diff --git a/src/socket_base.cpp b/src/socket_base.cpp index a3a9571a..4a79b717 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -184,7 +184,7 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool tag (0xbaddecaf), ctx_terminated (false), destroyed (false), - poller(nullptr), + poller(NULL), handle(NULL), last_tsc (0), ticks (0), diff --git a/src/thread.hpp b/src/thread.hpp index 27ea8fc7..cd555a41 100644 --- a/src/thread.hpp +++ b/src/thread.hpp @@ -55,8 +55,8 @@ namespace zmq public: inline thread_t () - : tfn(nullptr) - , arg(nullptr) + : tfn(NULL) + , arg(NULL) { } diff --git a/src/udp_engine.cpp b/src/udp_engine.cpp index f18d0b63..f4d8cf34 100644 --- a/src/udp_engine.cpp +++ b/src/udp_engine.cpp @@ -51,7 +51,7 @@ zmq::udp_engine_t::udp_engine_t() : fd(-1), session(NULL), handle(NULL), - address(nullptr), + address(NULL), send_enabled(false), recv_enabled(false) {