use range-based for loop

arangodb · Nov 25, 2015 · a7c8a37 · a7c8a37
1 parent 9b1ef91
commit a7c8a37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 98 deletions.
diff --git a/arangod/Actions/actions.cpp b/arangod/Actions/actions.cpp
@@ -33,7 +33,6 @@
 #include "Basics/ReadWriteLock.h"
 #include "Basics/StringUtils.h"
 #include "Basics/WriteLocker.h"
-#include "Basics/delete_object.h"
 #include "Basics/logging.h"
 #include "Rest/HttpRequest.h"
 
@@ -48,13 +47,13 @@ using namespace triagens::basics;
 /// @brief actions
 ////////////////////////////////////////////////////////////////////////////////
 
-static map<string, TRI_action_t*> Actions;
+static std::map<string, TRI_action_t*> Actions;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief prefix actions
 ////////////////////////////////////////////////////////////////////////////////
 
-static map<string, TRI_action_t*> PrefixActions;
+static std::map<string, TRI_action_t*> PrefixActions;
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief actions lock
@@ -180,10 +179,14 @@ TRI_action_t* TRI_LookupActionVocBase (triagens::rest::HttpRequest* request) {
 ////////////////////////////////////////////////////////////////////////////////
 
 void TRI_CleanupActions () {
-  for_each(Actions.begin(), Actions.end(), DeleteObjectValue());
+  for (auto& it: Actions) {
+    delete it.second;
+  }
   Actions.clear();
 
-  for_each(PrefixActions.begin(), PrefixActions.end(), DeleteObjectValue());
+  for (auto& it: PrefixActions) {
+    delete it.second;
+  }
   PrefixActions.clear();
 }
 

diff --git a/arangod/ApplicationServer/ApplicationServer.cpp b/arangod/ApplicationServer/ApplicationServer.cpp
@@ -44,7 +44,6 @@
 #include "Basics/FileUtils.h"
 #include "Basics/RandomGenerator.h"
 #include "Basics/StringUtils.h"
-#include "Basics/delete_object.h"
 #include "Basics/conversions.h"
 #include "Basics/logging.h"
 #include "Basics/files.h"
@@ -129,7 +128,9 @@ ApplicationServer::ApplicationServer (std::string const& name, std::string const
 
 ApplicationServer::~ApplicationServer () {
   Random::shutdown();
-  for_each(_features.begin(), _features.end(), DeleteObjectAny());
+  for (auto& it : _features) {
+    delete it;
+  }
 }
 
 // -----------------------------------------------------------------------------

diff --git a/arangod/HttpServer/ApplicationEndpointServer.cpp b/arangod/HttpServer/ApplicationEndpointServer.cpp
@@ -35,7 +35,6 @@
 #include "Basics/RandomGenerator.h"
 #include "Basics/ReadLocker.h"
 #include "Basics/WriteLocker.h"
-#include "Basics/delete_object.h"
 #include "Basics/json.h"
 #include "Basics/logging.h"
 #include "Basics/ssl-helper.h"
@@ -134,7 +133,9 @@ ApplicationEndpointServer::~ApplicationEndpointServer () {
   // overloaded class operator is a little unwieldy.
   // ..........................................................................
 
-  for_each(_servers.begin(), _servers.end(), triagens::basics::DeleteObjectAny());
+  for (auto& it : _servers) {
+    delete it;
+  }
   _servers.clear();
 
   if (_handlerFactory != nullptr) {

diff --git a/lib/Basics/delete_object.h b/lib/Basics/delete_object.h