summaryrefslogtreecommitdiff
path: root/src/socket_base.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-07-24 18:25:30 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-07-24 18:25:30 +0200
commit7c1dca546d9e49e7af372e4fff9e6a87058a7f12 (patch)
treef00c6760dcd14b944457928405e7e2eca23b1ff8 /src/socket_base.cpp
parentf716b571baf59c1b622c7666bb8bf2905126a3d4 (diff)
Session classes merged into a single class
Removal of ZMQ_IDENTITY resulted in various session classes doing almost the same thing. This patch merges the classes into a single class. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/socket_base.cpp')
-rw-r--r--src/socket_base.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 92715b1..2ec3998 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -37,7 +37,7 @@
#include "zmq_listener.hpp"
#include "zmq_connecter.hpp"
#include "io_thread.hpp"
-#include "connect_session.hpp"
+#include "session.hpp"
#include "config.hpp"
#include "clock.hpp"
#include "pipe.hpp"
@@ -441,8 +441,8 @@ int zmq::socket_base_t::connect (const char *addr_)
}
// Create session.
- connect_session_t *session = new (std::nothrow) connect_session_t (
- io_thread, this, options, protocol.c_str (), address.c_str ());
+ session_t *session = new (std::nothrow) session_t (
+ io_thread, true, this, options, protocol.c_str (), address.c_str ());
alloc_assert (session);
// Create a bi-directional pipe.