[Orxonox-commit 4957] r9626 - code/branches/core6/src/libraries/core/class

landauf at orxonox.net landauf at orxonox.net
Fri Aug 9 00:25:11 CEST 2013


Author: landauf
Date: 2013-08-09 00:25:11 +0200 (Fri, 09 Aug 2013)
New Revision: 9626

Modified:
   code/branches/core6/src/libraries/core/class/Identifier.h
Log:
fixed compiler issue with msvc

Modified: code/branches/core6/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/core6/src/libraries/core/class/Identifier.h	2013-05-21 13:12:21 UTC (rev 9625)
+++ code/branches/core6/src/libraries/core/class/Identifier.h	2013-08-08 22:25:11 UTC (rev 9626)
@@ -295,6 +295,9 @@
                 SuperFunctionDestruction<0, T>::destroy(this);
             }
 
+            void updateConfigValues(bool updateChildren, Listable*) const;
+            void updateConfigValues(bool updateChildren, Identifiable*) const;
+
             static ClassIdentifier<T>* classIdentifier_s;
     };
 
@@ -428,6 +431,12 @@
     template <class T>
     void ClassIdentifier<T>::updateConfigValues(bool updateChildren) const
     {
+        this->updateConfigValues(updateChildren, static_cast<T*>(NULL));
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::updateConfigValues(bool updateChildren, Listable*) const
+    {
         if (!this->hasConfigValues())
             return;
 
@@ -439,7 +448,13 @@
                 (*it)->updateConfigValues(false);
     }
 
+    template <class T>
+    void ClassIdentifier<T>::updateConfigValues(bool updateChildren, Identifiable*) const
+    {
+        // no action
+    }
 
+
     // ###############################
     // ###      orxonox_cast       ###
     // ###############################




More information about the Orxonox-commit mailing list