Changeset 10776 for code/branches/cpp11_v2/src/libraries/core

Timestamp:

Nov 8, 2015, 11:11:00 AM (9 years ago)

Author:

landauf

Message:

using std::array instead of boost::array

Location:

code/branches/cpp11_v2/src/libraries/core/config

Files:

• ConfigFileManager.cc (modified) (2 diffs)
• ConfigFileManager.h (modified) (2 diffs)

code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc

@@ -47 +47 @@
     ConfigFileManager::ConfigFileManager()
     {
-        this->configFiles_.assign(nullptr);
+        this->configFiles_.fill(nullptr);
     }
 
@@ -53 +53 @@
     ConfigFileManager::~ConfigFileManager()
     {
-        for (boost::array<ConfigFile*, 3>::const_iterator it = this->configFiles_.begin(); it != this->configFiles_.end(); ++it)
+        for (std::array<ConfigFile*, 3>::const_iterator it = this->configFiles_.begin(); it != this->configFiles_.end(); ++it)
             if (*it)
                 delete (*it);

code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h

@@ -38 +38 @@
 #include "core/CorePrereqs.h"
 
-#include <boost/array.hpp>
+#include <array>
 
 #include "util/Singleton.h"
@@ -69 +69 @@
             ConfigFileManager(const ConfigFileManager&);    ///< Copy-constructor: not implemented
 
-            boost::array<ConfigFile*, 3> configFiles_;      ///< Stores the config files for each type in an array (must have the same size like ConfigFileType::Value)
+            std::array<ConfigFile*, 3> configFiles_;        ///< Stores the config files for each type in an array (must have the same size like ConfigFileType::Value)
             static ConfigFileManager* singletonPtr_s;       ///< Stores the singleton-pointer
     };