summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2009-12-21 20:45:52 +0100
committerMartin Sustrik <sustrik@fastmq.commkdir>2009-12-21 20:45:52 +0100
commit7cf18a2aec8300099e3c3e236ac3cefa3be746d0 (patch)
treee7ea6bb167548931d19f0d6d9fe70b18e2a9c2ff /src
parent5a0674dfeccf0d80dc92e77a8630be280c71fb84 (diff)
minor fixes
Diffstat (limited to 'src')
-rw-r--r--src/app_thread.cpp4
-rw-r--r--src/object.hpp4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index 666116f..69e0942 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -191,8 +191,8 @@ zmq::socket_base_t *zmq::app_thread_t::create_socket (int type_)
s = new (std::nothrow) downstream_t (this);
break;
default:
- // TODO: This should be EINVAL.
- zmq_assert (false);
+ errno = EINVAL;
+ return NULL;
}
zmq_assert (s);
diff --git a/src/object.hpp b/src/object.hpp
index 496fd49..b8d06b9 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -29,10 +29,6 @@ namespace zmq
class object_t
{
- // Repository of sessions needs to use caller's send_* functions
- // when creating new session. TODO: Get rid of this dependency.
- friend class socket_base_t;
-
public:
object_t (class dispatcher_t *dispatcher_, int thread_slot_);