diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-11-03 16:59:36 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-11-03 16:59:36 -0400 |
| commit | b68bca35db1e8515ad981f8ebaef92637fa5b036 (patch) | |
| tree | 1b1ddba3e3f2381c92420c0174abd919d4324058 /controller/RethinkDB.hpp | |
| parent | d97adc8789c2a38d0106c83b0f02522f9cf0d7dd (diff) | |
| download | infinitytier-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/RethinkDB.hpp')
| -rw-r--r-- | controller/RethinkDB.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller/RethinkDB.hpp b/controller/RethinkDB.hpp index cb6c061e..9e65521d 100644 --- a/controller/RethinkDB.hpp +++ b/controller/RethinkDB.hpp @@ -33,6 +33,7 @@ #include <unordered_map> #include <unordered_set> #include <vector> +#include <atomic> #include "../ext/json/json.hpp" @@ -135,7 +136,7 @@ private: std::unordered_multimap< uint64_t,uint64_t > _networkByMember; mutable std::mutex _networks_l; - BlockingQueue< std::unique_ptr<nlohmann::json> > _commitQueue; + BlockingQueue< nlohmann::json * > _commitQueue; std::thread _commitThread[ZT_CONTROLLER_RETHINKDB_COMMIT_THREADS]; mutable std::mutex _readyLock; // locked until ready |