diff options
| author | Nicky <sl.nicky.ml@googlemail.com> | 2019-06-06 20:59:54 +0200 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 18:40:45 -0400 |
| commit | dc8d2779ab3fa49fd4ff4495d8a2c642507bde69 (patch) | |
| tree | 003465eab4c13838822ba191a397e8b6c74ff541 /indra/llmessage | |
| parent | 69de6ece31c4bfc65edc6033c4a6d76477defde9 (diff) | |
Do not use string/chrono literals, sadly that won't work with GCC (4.9)
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcoproceduremanager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp index fa8e9c3ebf..13ee12b5bb 100644 --- a/indra/llmessage/llcoproceduremanager.cpp +++ b/indra/llmessage/llcoproceduremanager.cpp @@ -39,13 +39,11 @@ #include "llexception.h" #include "stringize.h" -using namespace std::literals; - //========================================================================= // Map of pool sizes for known pools static const std::map<std::string, U32> DefaultPoolSizes{ - {"Upload"s, 1}, - {"AIS"s, 1}, + {std::string("Upload"), 1}, + {std::string("AIS"), 1}, // *TODO: Rider for the moment keep AIS calls serialized otherwise the COF will tend to get out of sync. }; @@ -349,7 +347,7 @@ void LLCoprocedurePool::coprocedureInvokerCoro(LLCoreHttpUtil::HttpCoroutineAdap { QueuedCoproc::ptr_t coproc; boost::fibers::channel_op_status status; - while ((status = mPendingCoprocs.pop_wait_for(coproc, 10s)) != boost::fibers::channel_op_status::closed) + while ((status = mPendingCoprocs.pop_wait_for(coproc, std::chrono::seconds(10))) != boost::fibers::channel_op_status::closed) { if(status == boost::fibers::channel_op_status::timeout) { |