From 153d25d3ab8c9942cac8f14911c20f157e6a631b Mon Sep 17 00:00:00 2001
From: Andrey Abramov <gnusmas@kvolitek.ru>
Date: Fri, 8 Jun 2018 17:40:51 +0300
Subject: [PATCH] fix ms compilation (#5566)

---
 arangod/Aql/EngineInfoContainerDBServer.cpp | 27 +++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/arangod/Aql/EngineInfoContainerDBServer.cpp b/arangod/Aql/EngineInfoContainerDBServer.cpp
index e14d82525a..3060c926b9 100644
--- a/arangod/Aql/EngineInfoContainerDBServer.cpp
+++ b/arangod/Aql/EngineInfoContainerDBServer.cpp
@@ -355,11 +355,10 @@ void EngineInfoContainerDBServer::addNode(ExecutionNode* node) {
         auto const& colNode = *ExecutionNode::castTo<EnumerateCollectionNode const*>(node);
         auto const* col = colNode.collection();
 
-        std::unordered_set<std::string> const restrictedShard(
-          colNode.isRestricted()
-            ? std::initializer_list<std::string>{ colNode.restrictedShard() }
-            : std::initializer_list<std::string>{ }
-        );
+        std::unordered_set<std::string> restrictedShard;
+        if (colNode.isRestricted()) {
+          restrictedShard.emplace(colNode.restrictedShard());
+        }
 
         handleCollection(col, AccessMode::Type::READ, scatter, restrictedShard);
         updateCollection(col);
@@ -371,11 +370,10 @@ void EngineInfoContainerDBServer::addNode(ExecutionNode* node) {
         auto const& idxNode = *ExecutionNode::castTo<IndexNode const*>(node);
         auto const* col = idxNode.collection();
 
-        std::unordered_set<std::string> const restrictedShard(
-          idxNode.isRestricted()
-            ? std::initializer_list<std::string>{ idxNode.restrictedShard() }
-            : std::initializer_list<std::string>{ }
-        );
+        std::unordered_set<std::string> restrictedShard;
+        if (idxNode.isRestricted()) {
+          restrictedShard.emplace(idxNode.restrictedShard());
+        }
 
         handleCollection(col, AccessMode::Type::READ, scatter, restrictedShard);
         updateCollection(col);
@@ -411,11 +409,10 @@ void EngineInfoContainerDBServer::addNode(ExecutionNode* node) {
         auto const& modNode = *ExecutionNode::castTo<ModificationNode const*>(node);
         auto const* col = modNode.collection();
 
-        std::unordered_set<std::string> const restrictedShard(
-          modNode.isRestricted()
-            ? std::initializer_list<std::string>{ modNode.restrictedShard() }
-            : std::initializer_list<std::string>{ }
-        );
+        std::unordered_set<std::string> restrictedShard;
+        if (modNode.isRestricted()) {
+          restrictedShard.emplace(modNode.restrictedShard());
+        }
 
         handleCollection(col, AccessMode::Type::WRITE, scatter, restrictedShard);
         updateCollection(col);