Merge branch 'maint'

* maint: SunStudio fixed.

Merge branch 'maint'
* maint: SunStudio fixed.
da59f8dd · Martin Sustrik · e73c96ba · 21b0c0b4 · da59f8dd
Commit da59f8dd authored Oct 23, 2010 by Martin Sustrik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

object.cpp src/object.cpp +2 -2

No files found.
--- 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;