summaryrefslogtreecommitdiff
path: root/controller/EmbeddedNetworkController.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-11-03 16:59:36 -0400
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-11-03 16:59:36 -0400
commitb68bca35db1e8515ad981f8ebaef92637fa5b036 (patch)
tree1b1ddba3e3f2381c92420c0174abd919d4324058 /controller/EmbeddedNetworkController.hpp
parentd97adc8789c2a38d0106c83b0f02522f9cf0d7dd (diff)
downloadinfinitytier-b68bca35db1e8515ad981f8ebaef92637fa5b036.tar.gz
infinitytier-b68bca35db1e8515ad981f8ebaef92637fa5b036.zip
Linux build fixes, linux build rule for RethinkDB mode controller, also force disable shitty allocators in libstdc++.
Diffstat (limited to 'controller/EmbeddedNetworkController.hpp')
-rw-r--r--controller/EmbeddedNetworkController.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
index f16ea121..7149df10 100644
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@@ -28,6 +28,7 @@
#include <list>
#include <thread>
#include <unordered_map>
+#include <atomic>
#include "../node/Constants.hpp"
#include "../node/NetworkController.hpp"
@@ -239,7 +240,7 @@ private:
std::string _signingIdAddressString;
NetworkController::Sender *_sender;
ControllerDB _db;
- BlockingQueue< std::unique_ptr<_RQEntry> > _queue;
+ BlockingQueue< _RQEntry * > _queue;
std::vector<std::thread> _threads;
std::mutex _threads_l;
std::unordered_map< _MemberStatusKey,_MemberStatus,_MemberStatusHash > _memberStatus;