From 19373f80faab7cdf05b163d7608e6f2bc215fd1f Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Thu, 19 Nov 2015 01:41:42 +0100
Subject: [PATCH] removed dependency on vector.h

---
 arangod/Aql/AstNode.h           |  1 -
 arangod/Cluster/ClusterInfo.cpp | 17 ++++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/arangod/Aql/AstNode.h b/arangod/Aql/AstNode.h
index 55bf103f84..b9aabadc49 100644
--- a/arangod/Aql/AstNode.h
+++ b/arangod/Aql/AstNode.h
@@ -34,7 +34,6 @@
 #include "Basics/AttributeNameParser.h"
 #include "Basics/Exceptions.h"
 #include "Basics/json.h"
-#include "Basics/vector.h"
 #include "Basics/JsonHelper.h"
 
 #include <functional>
diff --git a/arangod/Cluster/ClusterInfo.cpp b/arangod/Cluster/ClusterInfo.cpp
index d776337940..d03f0b29d0 100644
--- a/arangod/Cluster/ClusterInfo.cpp
+++ b/arangod/Cluster/ClusterInfo.cpp
@@ -34,7 +34,6 @@
 #include "Basics/json.h"
 #include "Basics/logging.h"
 #include "Basics/tri-strings.h"
-#include "Basics/vector.h"
 #include "Basics/json-utilities.h"
 #include "Basics/JsonHelper.h"
 #include "Basics/MutexLocker.h"
@@ -403,8 +402,8 @@ bool ClusterInfo::doesDatabaseExist (DatabaseID const& databaseID,
 /// @brief get list of databases in the cluster
 ////////////////////////////////////////////////////////////////////////////////
 
-vector<DatabaseID> ClusterInfo::listDatabases (bool reload) {
-  vector<DatabaseID> result;
+std::vector<DatabaseID> ClusterInfo::listDatabases (bool reload) {
+  std::vector<DatabaseID> result;
 
   if (reload ||
       ! _plannedDatabasesProt.isValid ||
@@ -712,18 +711,18 @@ void ClusterInfo::loadPlannedCollections (bool acquireLock) {
       (*it).second._json = nullptr;
 
       shared_ptr<CollectionInfo> collectionData (new CollectionInfo(json));
-      vector<string>* shardKeys = new vector<string>;
+      std::vector<std::string>* shardKeys = new std::vector<std::string>;
       *shardKeys = collectionData->shardKeys();
       newShardKeys.insert(
-             make_pair(collection, shared_ptr<vector<string> > (shardKeys)));
+             make_pair(collection, shared_ptr<std::vector<std::string> > (shardKeys)));
       map<ShardID, ServerID> shardIDs = collectionData->shardIds();
-      vector<string>* shards = new vector<string>;
+      std::vector<std::string>* shards = new std::vector<std::string>;
       map<ShardID, ServerID>::iterator it3;
       for (it3 = shardIDs.begin(); it3 != shardIDs.end(); ++it3) {
         shards->push_back(it3->first);
       }
       newShards.emplace(
-              std::make_pair(collection, shared_ptr<vector<string> >(shards)));
+              std::make_pair(collection, shared_ptr<std::vector<std::string> >(shards)));
 
       // insert the collection into the existing map, insert it under its
       // ID as well as under its name, so that a lookup can be done with
@@ -2357,9 +2356,9 @@ int ClusterInfo::getResponsibleShard (CollectionID const& collectionID,
   }
 
   int tries = 0;
-  shared_ptr<vector<string> > shardKeysPtr;
+  shared_ptr<std::vector<std::string> > shardKeysPtr;
   char const** shardKeys = nullptr;
-  shared_ptr<vector<ShardID> > shards;
+  shared_ptr<std::vector<ShardID> > shards;
   bool found = false;
 
   while (true) {