From c26c2bc3f0a4c254aac8ded86162d72eee7dea0a Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Thu, 18 Apr 2019 15:27:40 -0700
Subject: [PATCH] Improved aggregate init syntax for DefaultPoolSizes map.
---
indra/llmessage/llcoproceduremanager.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index 1b82cb8c996..46c29d82b78 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -37,12 +37,13 @@
#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", 1},
- {"AIS", 1},
+static const std::map<std::string, U32> DefaultPoolSizes{
+ {"Upload"s, 1},
+ {"AIS"s, 1},
// *TODO: Rider for the moment keep AIS calls serialized otherwise the COF will tend to get out of sync.
};
@@ -347,7 +348,6 @@ void LLCoprocedurePool::coprocedureInvokerCoro(LLCoreHttpUtil::HttpCoroutineAdap
{
QueuedCoproc::ptr_t coproc;
boost::fibers::channel_op_status status;
- using namespace std::chrono_literals;
while ((status = mPendingCoprocs.pop_wait_for(coproc, 10s)) != boost::fibers::channel_op_status::closed)
{
if(status == boost::fibers::channel_op_status::timeout)
--
GitLab