Changeset 9607 for code

Timestamp:

Mar 30, 2013, 9:38:52 PM (12 years ago)

Author:

landauf

Message:

no need to inherit virtually from OrxonoxClass anymore

Location:

code/branches/core6

Files:

• src/libraries/core/BaseObject.h (modified) (1 diff)
• src/libraries/core/class/OrxonoxClass.h (modified) (1 diff)
• src/libraries/tools/Timer.h (modified) (1 diff)
• test/core/object/IteratorTest.cc (modified) (1 diff)

code/branches/core6/src/libraries/core/BaseObject.h

@@ -60 +60 @@
 
     /// The BaseObject is the parent of all classes representing an instance in the game.
-    class _CoreExport BaseObject : virtual public OrxonoxClass
+    class _CoreExport BaseObject : public OrxonoxClass
     {
         template <class T> friend class XMLPortClassParamContainer;

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

@@ -50 +50 @@
     /**
         @brief This is the class from which all objects of the game-logic (not the engine) are derived from.
-
-        The BaseObject and other classes are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
     */
     class _CoreExport OrxonoxClass : virtual public Configurable, virtual public Destroyable

code/branches/core6/src/libraries/tools/Timer.h

@@ -102 +102 @@
         on the game time.
     */
-    class _ToolsExport Timer : virtual public OrxonoxClass
+    class _ToolsExport Timer : public OrxonoxClass
     {
         public:

code/branches/core6/test/core/object/IteratorTest.cc

@@ -11 +11 @@
     namespace
     {
-        class TestInterface : public OrxonoxInterface
+        class TestInterface : virtual public OrxonoxInterface
         {
             public: