Changeset 7196 for code/branches/consolecommands3/src/libraries/core/Executor.h

Timestamp:

Aug 21, 2010, 4:54:29 PM (14 years ago)

Author:

landauf

Message:

Changed implementation of SharedPtr, it's now non-intrusive and uses an allocated counter instead. Hence it's possible to create an instance of SharedPtr<T> even if T is only known from a forward declaration. Also changed some parts of the code to reflect the inheritance of the underlying object pointers without using inheritance in the SharedPtr itself.

File:

• code/branches/consolecommands3/src/libraries/core/Executor.h (modified) (3 diffs)

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

@@ -36 +36 @@
 #include "util/MultiType.h"
 #include "Functor.h"
+#include "ExecutorPtr.h"
 
 namespace orxonox
@@ -112 +113 @@
 
         private:
-            inline void incrementReferenceCount()
-                { ++this->references_; }
-            inline void decrementReferenceCount()
-                { --this->references_; if (this->references_ == 0) delete this; }
-
-            int references_;
             static int instances_s;
     };
@@ -198 +193 @@
     };
 
-
-
-    typedef SharedPtr<Executor> ExecutorPtr;
-
-    typedef SharedChildPtr<ExecutorStatic, Executor> ExecutorStaticPtr;
-
-    template <class T>
-    class ExecutorMemberPtr : public SharedChildPtr<ExecutorMember<T>, Executor>
-    {
-        public:
-            inline ExecutorMemberPtr() : SharedChildPtr<ExecutorMember<T>, Executor>() {}
-            inline ExecutorMemberPtr(ExecutorMember<T>* pointer) : SharedChildPtr<ExecutorMember<T>, Executor>(pointer) {}
-//            inline ExecutorMemberPtr(const ExecutorMemberPtr& other) : SharedChildPtr<ExecutorMember<T>, Executor>(other) {}
-    };
-
-
-
     inline Executor* createExecutor(Functor* functor, const std::string& name = "")
     {