Changeset 7197 for code/branches/consolecommands3/src/libraries/core/SharedPtr.h

Timestamp:

Aug 21, 2010, 9:03:23 PM (14 years ago)

Author:

landauf

Message:

Changed the implementation of SharedPtr again. I decided to represent the inheritance of the underlying object pointers by using inheritance in the SharedPtr itself (with SharedChildPtr : public SharedPtr). The previous solution led to ambiguity in functions that are overloaded for different types of SharedPtr (for example createExecutor).

File:

• code/branches/consolecommands3/src/libraries/core/SharedPtr.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/SharedPtr.h

@@ -32 +32 @@
 #include "CorePrereqs.h"
 #include <algorithm>
+#include <cassert>
 
 namespace orxonox
@@ -168 +169 @@
             SharedPtrDestroyer* destroyer_;
     };
-/*
+
     template <class T, class Parent>
-    class SharedChildPtr : public SharedPtr<Parent>
+    class SharedChildPtr : public Parent
     {
         public:
-            inline SharedChildPtr() : SharedPtr<Parent>() {}
-            inline SharedChildPtr(T* pointer) : SharedPtr<Parent>(pointer) {}
-            inline SharedChildPtr(const SharedChildPtr& other) : SharedPtr<Parent>(other) {}
-            inline const SharedChildPtr& operator=(const SharedChildPtr& other) { SharedPtr<Parent>::operator=(other); return *this; }
-            inline T* operator->() const { return static_cast<T*>(SharedPtr<Parent>::operator->()); }
-            inline T& operator*() const { return *static_cast<T*>(SharedPtr<Parent>::operator->()); }
+            inline SharedChildPtr() : Parent() {}
+            inline SharedChildPtr(T* pointer) : Parent(pointer) {}
+//            inline SharedChildPtr(const SharedChildPtr& other) : Parent(other) {}
+//            template <class O>
+//            inline SharedChildPtr(const SharedChildPtr<O, T>& other) : Parent(other) {}
+            inline SharedChildPtr(const SharedPtr<T>& other) : Parent(other) {}
+
+//            inline const SharedChildPtr& operator=(const SharedChildPtr& other) { Parent::operator=(other); return *this; }
+
+            inline T* operator->() const { return static_cast<T*>(Parent::operator->()); }
+            inline T& operator*() const { return *static_cast<T*>(Parent::operator->()); }
     };
-*/
+
 }