Changeset 9586 for code/branches/core6

Timestamp:

Mar 26, 2013, 11:30:57 PM (12 years ago)

Author:

landauf

Message:

call setConfigValues() only if the class is actually a Configurable

File:

• code/branches/core6/src/libraries/core/class/Identifier.h (modified) (4 diffs)

code/branches/core6/src/libraries/core/class/Identifier.h

@@ -288 +288 @@
 
             bool initialiseObject(T* object, const std::string& className, bool bRootClass);
+
+            void setConfigValues(T* object, Configurable*) const;
+            void setConfigValues(T* object, Identifiable*) const;
 
             void addObjectToList(T* object, Listable*);
@@ -390 +393 @@
             }
 
-            object->setConfigValues();
+            this->setConfigValues(object, object);
             return true;
         }
@@ -404 +407 @@
 
     /**
+     * @brief Only configures the object if is a @ref Configurable
+     */
+    template <class T>
+    void ClassIdentifier<T>::setConfigValues(T* object, Configurable*) const
+    {
+        object->setConfigValues();
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::setConfigValues(T*, Identifiable*) const
+    {
+        // no action
+    }
+
+    /**
      * @brief Only adds the object to the object list if is a @ref Listable
      */
@@ -429 +447 @@
 
         for (ObjectListIterator<T> it = ObjectList<T>::begin(); it; ++it)
-            it->setConfigValues();
+            this->setConfigValues(*it, *it);
 
         if (updateChildren)