summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-10-23 13:51:12 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-23 13:51:12 +0200
commitda59f8dd7a7f275eff98e5705767ac89ac503912 (patch)
tree847664fe0b691a82cc82be7735ae687e5a4d64fa /src
parente73c96ba30c5e9ada83592bc2289a56eeadf6155 (diff)
parent21b0c0b4f7896facbfcaf10c8eb777e72a505a45 (diff)
Merge branch 'maint'
* maint: SunStudio fixed.
Diffstat (limited to 'src')
-rw-r--r--src/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object.cpp b/src/object.cpp
index fc08785..9a4bd74 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -88,8 +88,8 @@ void zmq::object_t::process_command (command_t &cmd_)
case command_t::bind:
process_bind (cmd_.args.bind.in_pipe, cmd_.args.bind.out_pipe,
- blob_t (cmd_.args.bind.peer_identity,
- cmd_.args.bind.peer_identity_size));
+ cmd_.args.bind.peer_identity ? blob_t (cmd_.args.bind.peer_identity,
+ cmd_.args.bind.peer_identity_size) : blob_t ());
process_seqnum ();
break;