ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-15 13:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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/EmbeddedNetworkController.hpp
View File

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