[Orxonox-commit 6118] r10776 - code/branches/cpp11_v2/src/libraries/core/config

[landauf at orxonox.net]

Author: landauf
Date: 2015-11-08 11:11:00 +0100 (Sun, 08 Nov 2015)
New Revision: 10776

Modified:
   code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc
   code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h
Log:
using std::array instead of boost::array

Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc	2015-11-08 09:40:44 UTC (rev 10775)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc	2015-11-08 10:11:00 UTC (rev 10776)
@@ -46,13 +46,13 @@
     /// Constructor: Initializes the array of config files with nullptr.
     ConfigFileManager::ConfigFileManager()
     {
-        this->configFiles_.assign(nullptr);
+        this->configFiles_.fill(nullptr);
     }
 
     /// Destructor: Deletes the config files.
     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);
     }

Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h	2015-11-08 09:40:44 UTC (rev 10775)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.h	2015-11-08 10:11:00 UTC (rev 10776)
@@ -37,7 +37,7 @@
 
 #include "core/CorePrereqs.h"
 
-#include <boost/array.hpp>
+#include <array>
 
 #include "util/Singleton.h"
 
@@ -68,7 +68,7 @@
         private:
             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
     };
 }