dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux build fixes, linux build rule for RethinkDB mode controller, also force disable shitty allocators in libstdc++.

Browse source
This commit is contained in:
Adam Ierymenko 2017-11-03 16:59:36 -04:00
parent d97adc8789
commit b68bca35db
7 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
controller/RethinkDB.hpp
View file

@ -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