summaryrefslogtreecommitdiff
path: root/src/app_thread.cpp
diff options
context:
space:
mode:
authorMartin Lucina <martin@lucina.net>2012-01-23 08:53:25 +0100
committerMartin Lucina <martin@lucina.net>2012-01-23 08:53:25 +0100
commit5ba1cb20fe6f6699cef1cc726718e760cd4c9af1 (patch)
treedf7b144c5325fd8b3c88c49b456fafc24249abe6 /src/app_thread.cpp
parenta15854bd92db69fcd0b4444fe1b8fe3610a7acf6 (diff)
Imported Upstream version 2.0.9.dfsgupstream/2.0.9.dfsg
Diffstat (limited to 'src/app_thread.cpp')
-rw-r--r--src/app_thread.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index fbf034c..ac59464 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -46,8 +46,8 @@
#include "rep.hpp"
#include "xreq.hpp"
#include "xrep.hpp"
-#include "upstream.hpp"
-#include "downstream.hpp"
+#include "pull.hpp"
+#include "push.hpp"
// If the RDTSC is available we use it to prevent excessive
// polling for commands. The nice thing here is that it will work on any
@@ -157,11 +157,11 @@ zmq::socket_base_t *zmq::app_thread_t::create_socket (int type_)
case ZMQ_XREP:
s = new (std::nothrow) xrep_t (this);
break;
- case ZMQ_UPSTREAM:
- s = new (std::nothrow) upstream_t (this);
+ case ZMQ_PULL:
+ s = new (std::nothrow) pull_t (this);
break;
- case ZMQ_DOWNSTREAM:
- s = new (std::nothrow) downstream_t (this);
+ case ZMQ_PUSH:
+ s = new (std::nothrow) push_t (this);
break;
default:
if (sockets.empty ())