Merge pull request #55 from banburybill/master

hintjens · hintjens · commit a4459abdd1d7 · 2015-11-01T17:34:17.000+01:00
Extend C++11 guard to cover remaining use of std::vector data().
diff --git a/zmq.hpp b/zmq.hpp
@@ -144,12 +144,12 @@ namespace zmq
     {
         return poll(items.data(), items.size(), timeout.count() );
     }
-    #endif
 
     inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)
     {
         return poll(items.data(), items.size(), timeout_);
     }
+    #endif
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -144,12 +144,12 @@ namespace zmq`
`144`	`144`	`{`
`145`	`145`	`return poll(items.data(), items.size(), timeout.count() );`
`146`	`146`	`}`
`147`		`- #endif`
`148`	`147`
`149`	`148`	`inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)`
`150`	`149`	`{`
`151`	`150`	`return poll(items.data(), items.size(), timeout_);`
`152`	`151`	`}`
	`152`	`+ #endif`
`153`	`153`
`154`	`154`
`155`	`155`