Merge pull request #32 from madevgeny/master

hintjens · hintjens · commit 77b55a27b0c3 · 2014-03-14T10:13:21.000+01:00
Fixed assert on Win8.1. Thanks to jonwfreeman.
diff --git a/zmq.hpp b/zmq.hpp
@@ -254,7 +254,7 @@ namespace zmq
         }
 
 
-        inline explicit context_t (int io_threads_, int max_sockets_ = 1024)
+        inline explicit context_t (int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT)
         {
             ptr = zmq_ctx_new ();
             if (ptr == NULL)

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ namespace zmq`
`254`	`254`	`}`
`255`	`255`
`256`	`256`
`257`		`- inline explicit context_t (int io_threads_, int max_sockets_ = 1024)`
	`257`	`+ inline explicit context_t (int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT)`
`258`	`258`	`{`
`259`	`259`	`ptr = zmq_ctx_new ();`
`260`	`260`	`if (ptr == NULL)`