diff options
| author | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-09-14 09:40:35 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-09-14 09:40:35 +0200 |
| commit | 36707529a7d82b164b59d42fe0d5d8a35c3dd279 (patch) | |
| tree | d7efed0bee07b8a5eff92074f58257cf65f60c9c | |
| parent | 89b1f2782ca6a1db9c68b7d642b5a41cc4d56414 (diff) | |
minor merge problem corrected
| -rw-r--r-- | src/pub.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pub.cpp b/src/pub.cpp index 9f2729b..d6eca01 100644 --- a/src/pub.cpp +++ b/src/pub.cpp @@ -23,7 +23,7 @@ #include "err.hpp" zmq::pub_t::pub_t (class app_thread_t *parent_) : - socket_base_t (parent_) + socket_base_t (parent_, ZMQ_SUB) { } |