Changeset 8866 for code/trunk/src/libraries

Timestamp:

Aug 24, 2011, 3:28:55 PM (13 years ago)

Author:

dafrick

Message:

Moved clone base method into Pickupable to avoid ambiguity.

Location:

code/trunk/src/libraries/core

Files:

• OrxonoxClass.h (modified) (2 diffs)
• Super.h (modified) (1 diff)

code/trunk/src/libraries/core/OrxonoxClass.h

@@ -115 +115 @@
             bool isDirectParentOf(const OrxonoxClass* object);
 
-            virtual void clone(OrxonoxClass*& item) {}
-
             /// Returns the number of @ref orxonox::SmartPtr "smart pointers" that point to this object.
             inline unsigned int getReferenceCount() const
@@ -197 +195 @@
     };
 
-    SUPER_FUNCTION(11, OrxonoxClass, clone, false);
 }
 

code/trunk/src/libraries/core/Super.h

@@ -566 +566 @@
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
 
-        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass* item)
+        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass*& item)
             (item)
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;