fbzmq: Update to 2019.10.07.00

Added patch that adds libfolly boost dependencies.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 7a5326dd29)
This commit is contained in:
Rosen Penev
2019-10-07 10:58:14 -07:00
parent 1220667338
commit d1f0d0f2cc
3 changed files with 24 additions and 39 deletions
+13
View File
@@ -0,0 +1,13 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,10 @@ find_package(Threads REQUIRED)
find_package(Boost 1.67.0 MODULE
COMPONENTS
context
+ filesystem
+ program_options
+ regex
+ system
REQUIRED
)
-31
View File
@@ -1,31 +0,0 @@
--- a/fbzmq/zmq/Message.cpp
+++ b/fbzmq/zmq/Message.cpp
@@ -35,7 +35,7 @@ Message::allocate(size_t size) noexcept {
if (rc != 0) {
return folly::makeUnexpected(Error());
}
- return std::move(msg);
+ return msg;
}
folly::Expected<Message, Error>
@@ -58,7 +58,7 @@ Message::wrapBuffer(std::unique_ptr<folly::IOBuf> buf) noexcept {
delete ptr;
return folly::makeUnexpected(Error());
}
- return std::move(msg);
+ return msg;
}
Message&
--- a/fbzmq/zmq/Socket.cpp
+++ b/fbzmq/zmq/Socket.cpp
@@ -449,7 +449,7 @@ SocketImpl::recv(int flags) const noexcept {
while (true) {
const int n = zmq_msg_recv(&(msg.msg_), ptr_, flags);
if (n >= 0) {
- return std::move(msg);
+ return msg;
}
const int err = zmq_errno();