6 files changed, 0 insertions, 21 deletions
diff --git a/examples/chat/display.cpp b/examples/chat/display.cpp
index 3da565e..eb55aa8 100644
--- a/examples/chat/display.cpp
+++ b/examples/chat/display.cpp
@@ -41,7 +41,6 @@ int main (int argc, const char *argv [])
     zmq::context_t ctx (1, 1);
     zmq::socket_t s (ctx, ZMQ_SUB);
     s.connect (chatroom_out_address);
-    s.subscribe ("*");
     
     while (true) {
 
diff --git a/include/zmq.h b/include/zmq.h
index 14c4f44..46d779b 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -172,9 +172,6 @@ ZMQ_EXPORT int zmq_bind (void *s, const char *addr);
 //  Connect the socket to a particular address.
 ZMQ_EXPORT int zmq_connect (void *s, const char *addr);
 
-//  Subscribe for the subset of messages identified by 'criteria' argument.
-ZMQ_EXPORT int zmq_subscribe (void *s, const char *criteria);
-
 //  Send the message 'msg' to the socket 's'. 'flags' argument can be
 //  combination of following values:
 //  ZMQ_NOBLOCK - if message cannot be sent, return immediately.
diff --git a/include/zmq.hpp b/include/zmq.hpp
index 0ba972b..e8e4f15 100644
--- a/include/zmq.hpp
+++ b/include/zmq.hpp
@@ -260,12 +260,6 @@ namespace zmq
             }
         }
 
-        inline void subscribe (const char *criteria_)
-        {
-            int rc = zmq_subscribe (ptr, criteria_);
-            assert (rc == 0);
-        }
-
         inline int send (message_t &msg_, int flags_ = 0)
         {
             int rc = zmq_send (ptr, &msg_, flags_);
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 4fadad2..9701f65 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -147,11 +147,6 @@ int zmq::socket_base_t::connect (const char *addr_)
     return 0;
 }
 
-int zmq::socket_base_t::subscribe (const char *criteria_)
-{
-    zmq_assert (false);
-}
-
 int zmq::socket_base_t::send (struct zmq_msg *msg_, int flags_)
 {
     zmq_assert (false);
diff --git a/src/socket_base.hpp b/src/socket_base.hpp
index 4ccac48..e96cc2d 100644
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -41,7 +41,6 @@ namespace zmq
         virtual int setsockopt (int option_, void *optval_, size_t optvallen_);
         virtual int bind (const char *addr_);
         virtual int connect (const char *addr_);
-        virtual int subscribe (const char *criteria_);
         virtual int send (struct zmq_msg *msg_, int flags_);
         virtual int flush ();
         virtual int recv (struct zmq_msg *msg_, int flags_);
diff --git a/src/zmq.cpp b/src/zmq.cpp
index cca2a01..7ebe003 100644
--- a/src/zmq.cpp
+++ b/src/zmq.cpp
@@ -208,11 +208,6 @@ int zmq_connect (void *s_, const char *addr_)
     return (((zmq::socket_base_t*) s_)->connect (addr_));
 }
 
-int zmq_subscribe (void *s_, const char *criteria_)
-{
-    return (((zmq::socket_base_t*) s_)->subscribe (criteria_));
-}
-
 int zmq_send (void *s_, zmq_msg *msg_, int flags_)
 {
     return (((zmq::socket_base_t*) s_)->send (msg_, flags_));