mirror of
https://github.com/zeromq/libzmq.git
synced 2025-01-19 00:46:05 +01:00
Problem: nullptr is a reserved keyword in C++0x
Solution: use NULL instead to avoid build failure with older compilers.
This commit is contained in:
parent
7187169619
commit
ae8efc21e8
@ -59,7 +59,7 @@ namespace zmq
|
|||||||
inline encoder_base_t (size_t bufsize_) :
|
inline encoder_base_t (size_t bufsize_) :
|
||||||
write_pos(0),
|
write_pos(0),
|
||||||
to_write(0),
|
to_write(0),
|
||||||
next(nullptr),
|
next(NULL),
|
||||||
new_msg_flag(false),
|
new_msg_flag(false),
|
||||||
bufsize (bufsize_),
|
bufsize (bufsize_),
|
||||||
in_progress (NULL)
|
in_progress (NULL)
|
||||||
|
@ -184,7 +184,7 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
|
|||||||
tag (0xbaddecaf),
|
tag (0xbaddecaf),
|
||||||
ctx_terminated (false),
|
ctx_terminated (false),
|
||||||
destroyed (false),
|
destroyed (false),
|
||||||
poller(nullptr),
|
poller(NULL),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
last_tsc (0),
|
last_tsc (0),
|
||||||
ticks (0),
|
ticks (0),
|
||||||
|
@ -55,8 +55,8 @@ namespace zmq
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
inline thread_t ()
|
inline thread_t ()
|
||||||
: tfn(nullptr)
|
: tfn(NULL)
|
||||||
, arg(nullptr)
|
, arg(NULL)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ zmq::udp_engine_t::udp_engine_t() :
|
|||||||
fd(-1),
|
fd(-1),
|
||||||
session(NULL),
|
session(NULL),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
address(nullptr),
|
address(NULL),
|
||||||
send_enabled(false),
|
send_enabled(false),
|
||||||
recv_enabled(false)
|
recv_enabled(false)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user