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

Timestamp:

Aug 21, 2010, 4:54:29 PM (15 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/Functor.h (modified) (4 diffs)

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

@@ -38 +38 @@
 #include "util/Debug.h"
 #include "util/MultiType.h"
-#include "SharedPtr.h"
+#include "FunctorPtr.h"
 
 namespace orxonox
@@ -104 +104 @@
 
         public:
-            Functor() : references_(0) { ++instances_s; COUT(0) << "functor ++: " << instances_s << std::endl; }
+            Functor() { ++instances_s; COUT(0) << "functor ++: " << instances_s << std::endl; }
             virtual ~Functor() { --instances_s; COUT(0) << "functor --: " << instances_s << std::endl; }
 
@@ -124 +124 @@
 
         private:
-            inline void incrementReferenceCount()
-                { ++this->references_; }
-            inline void decrementReferenceCount()
-                { --this->references_; if (this->references_ == 0) delete this; }
-
-            int references_;
             static int instances_s;
     };
@@ -212 +206 @@
             T* object_;
             const T* constObject_;
-    };
-
-
-
-    typedef SharedPtr<Functor> FunctorPtr;
-
-    typedef SharedChildPtr<FunctorStatic, Functor> FunctorStaticPtr;
-
-    template <class T>
-    class FunctorMemberPtr : public SharedChildPtr<FunctorMember<T>, Functor>
-    {
-        public:
-            inline FunctorMemberPtr() : SharedChildPtr<FunctorMember<T>, Functor>() {}
-            inline FunctorMemberPtr(FunctorMember<T>* pointer) : SharedChildPtr<FunctorMember<T>, Functor>(pointer) {}
-//            inline FunctorMemberPtr(const FunctorMemberPtr& other) : SharedChildPtr<FunctorMember<T>, Functor>(other) {}
     };