Merge pull request #357 from gummif/gfa/nodiscard-recv

sigiesec · web-flow · commit e67fa0e16d79 · 2019-11-04T16:36:45.000+01:00
Problem: recv return value should not be ignored
diff --git a/zmq.hpp b/zmq.hpp
@@ -1348,7 +1348,7 @@ class socket_base
     }
 
 #ifdef ZMQ_CPP11
-    detail::recv_buffer_result_t recv(mutable_buffer buf,
+    ZMQ_NODISCARD detail::recv_buffer_result_t recv(mutable_buffer buf,
                                       recv_flags flags = recv_flags::none)
     {
         const int nbytes =
@@ -1362,7 +1362,7 @@ class socket_base
         throw error_t();
     }
 
-    detail::recv_result_t recv(message_t &msg, recv_flags flags = recv_flags::none)
+    ZMQ_NODISCARD detail::recv_result_t recv(message_t &msg, recv_flags flags = recv_flags::none)
     {
         const int nbytes = zmq_msg_recv(msg.handle(), _handle, static_cast<int>(flags));
         if (nbytes >= 0) {

Original file line number	Diff line number	Diff line change
`@@ -1348,7 +1348,7 @@ class socket_base`
`1348`	`1348`	`}`
`1349`	`1349`
`1350`	`1350`	`#ifdef ZMQ_CPP11`
`1351`		`- detail::recv_buffer_result_t recv(mutable_buffer buf,`
	`1351`	`+ ZMQ_NODISCARD detail::recv_buffer_result_t recv(mutable_buffer buf,`
`1352`	`1352`	`recv_flags flags = recv_flags::none)`
`1353`	`1353`	`{`
`1354`	`1354`	`const int nbytes =`
`@@ -1362,7 +1362,7 @@ class socket_base`
`1362`	`1362`	`throw error_t();`
`1363`	`1363`	`}`
`1364`	`1364`
`1365`		`- detail::recv_result_t recv(message_t &msg, recv_flags flags = recv_flags::none)`
	`1365`	`+ ZMQ_NODISCARD detail::recv_result_t recv(message_t &msg, recv_flags flags = recv_flags::none)`
`1366`	`1366`	`{`
`1367`	`1367`	`const int nbytes = zmq_msg_recv(msg.handle(), _handle, static_cast<int>(flags));`
`1368`	`1368`	`if (nbytes >= 0) {`