merge to upstream

2025-11-07 05:58:45 +01:00 · 2014-05-12 10:24:31 +03:00
parent acb71e0096 098d01b16f
commit d5991d6728
170 changed files with 3706 additions and 2455 deletions
--- a/src/socket_base.hpp
+++ b/src/socket_base.hpp
@@ -163,7 +163,7 @@ namespace zmq
        void process_destroy ();

        // Socket event data dispath
-        void monitor_event (zmq_event_t data_, const std::string& addr_);
+        void monitor_event (int event_, int value_, const std::string& addr_);

        // Monitor socket cleanup
        void stop_monitor ();