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/EmbeddedNetworkController.cpp | |
| 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/EmbeddedNetworkController.cpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index e8e0f5be..7cb931c6 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -496,7 +496,7 @@ void EmbeddedNetworkController::request( qe->identity = identity; qe->metaData = metaData; qe->type = _RQEntry::RQENTRY_TYPE_REQUEST; - _queue.post(std::unique_ptr<_RQEntry>(qe)); + _queue.post(qe); } unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET( @@ -1720,7 +1720,7 @@ void EmbeddedNetworkController::_startThreads() for(long t=0;t<hwc;++t) { _threads.emplace_back([this]() { for(;;) { - std::unique_ptr<_RQEntry> qe; + _RQEntry *qe = (_RQEntry *)0; if (_queue.get(qe)) break; try { |