Changeset 9667 for code/trunk/src/libraries/core/config

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/config (copied) (copied from code/branches/core6/src/libraries/core/config)
• src/libraries/core/config/CMakeLists.txt (modified) (1 diff)
• src/libraries/core/config/ConfigValueContainer.h (modified) (1 diff)
• src/libraries/core/config/Configurable.cc (copied) (copied from code/branches/core6/src/libraries/core/config/Configurable.cc)
• src/libraries/core/config/Configurable.h (modified) (1 diff)

code/trunk/src/libraries/core/config/CMakeLists.txt

@@ -6 +6 @@
   ConfigFileManager.cc
   ConfigFileSection.cc
+  Configurable.cc
   ConfigValueContainer.cc
   SettingsConfigFile.cc

code/trunk/src/libraries/core/config/ConfigValueContainer.h

@@ -70 +70 @@
             inline virtual void call(void* object)
             {
-                if (!IdentifierManager::isCreatingHierarchy())
+                if (!IdentifierManager::getInstance().isCreatingHierarchy())
                     (static_cast<T*>(object)->*this->function_)();
             }

code/trunk/src/libraries/core/config/Configurable.h

@@ -48 +48 @@
     {
         public:
+            Configurable();
+
             /// Function to collect the SetConfigValue-macro calls.
             void setConfigValues() {};