Changeset 7201

Timestamp:

Aug 22, 2010, 12:48:55 AM (14 years ago)

Author:

landauf

Message:

some cleanup in SharedPtr and its relatives

Location:

code/branches/consolecommands3/src/libraries/core

Files:

• Executor.cc (modified) (1 diff)
• Executor.h (modified) (1 diff)
• Functor.h (modified) (2 diffs)
• FunctorPtr.h (modified) (1 diff)
• SharedPtr.h (modified) (9 diffs)

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

@@ -39 +39 @@
 namespace orxonox
 {
-    int Functor::instances_s = 0;
-    int Executor::instances_s = 0;
-
     Executor::Executor(const FunctorPtr& functor, const std::string& name)
     {
         this->functor_ = functor;
         this->name_ = name;
-        ++instances_s; COUT(0) << "executor ++: " << instances_s << std::endl;
     }
 
     Executor::~Executor()
     {
-        --instances_s; COUT(0) << "executor --: " << instances_s << std::endl;
     }
 

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

@@ -109 +109 @@
             std::string name_;
             MultiType defaultValue_[MAX_FUNCTOR_ARGUMENTS];
-
-        private:
-            static int instances_s;
     };
 

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

@@ -102 +102 @@
 
         public:
-            Functor() { ++instances_s; COUT(0) << "functor ++: " << instances_s << std::endl; }
-            virtual ~Functor() { --instances_s; COUT(0) << "functor --: " << instances_s << std::endl; }
+            Functor() {}
+            virtual ~Functor() {}
 
             virtual MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null) = 0;
@@ -120 +120 @@
 
             virtual const std::type_info& getHeaderIdentifier() const = 0;
-
-        private:
-            static int instances_s;
     };
 

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

@@ -45 +45 @@
             inline FunctorMemberPtr() : SharedChildPtr<FunctorMember<T>, FunctorPtr>() {}
             inline FunctorMemberPtr(FunctorMember<T>* pointer) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(pointer) {}
-//            inline FunctorMemberPtr(const FunctorMemberPtr& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
-//            template <class O>
-//            inline FunctorMemberPtr(const SharedPtr<O>& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
-//            template <class O>
-//            inline FunctorMemberPtr(const SharedChildPtr<O, FunctorMember<T> >& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
             inline FunctorMemberPtr(const SharedPtr<FunctorMember<T> >& other) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(other) {}
-
-/*
-            inline const FunctorMemberPtr& operator=(const FunctorMemberPtr& other) { this->SharedChildPtr<FunctorMember<T>, FunctorPtr>::operator=(other); return *this; }
-            template <class O>
-            inline const FunctorMemberPtr& operator=(const SharedPtr<O>& other) { this->SharedChildPtr<FunctorMember<T>, FunctorPtr>::operator=(other); return *this; }
-*/
-        private:
-//            inline FunctorMemberPtr(FunctorMember<T>* pointer, int* counter) : SharedChildPtr<FunctorMember<T>, FunctorPtr>(pointer, counter) {}
     };
-/*
-    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) {}
-    };
-*/
 }
 

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

@@ -50 +50 @@
             void destroy()
             {
-//                COUT(0) << "delete " << this->pointer_ << std::endl;
                 delete this->pointer_;
             }
@@ -67 +66 @@
             inline SharedPtr() : pointer_(0), counter_(0), destroyer_(0)
             {
-//                COUT(0) << "SharedPtr (1): " << this->pointer_ << std::endl;
             }
 
             inline SharedPtr(T* pointer) : pointer_(pointer), counter_(0), destroyer_(0)
             {
-//                COUT(0) << "SharedPtr (2): " << this->pointer_ << std::endl;
                 if (this->pointer_)
                 {
@@ -82 +79 @@
             inline SharedPtr(const SharedPtr& other) : pointer_(other.pointer_), counter_(other.counter_), destroyer_(other.destroyer_)
             {
-//                COUT(0) << "SharedPtr (3): " << this->pointer_ << std::endl;
                 if (this->pointer_)
                     ++(*this->counter_);
@@ -90 +86 @@
             inline SharedPtr(const SharedPtr<O>& other) : pointer_(other.pointer_), counter_(other.counter_), destroyer_(other.destroyer_)
             {
-//                COUT(0) << "SharedPtr (4): " << this->pointer_ << std::endl;
                 if (this->pointer_)
                     ++(*this->counter_);
@@ -97 +92 @@
             inline ~SharedPtr()
             {
-//                COUT(0) << "~SharedPtr: " << this->pointer_ << std::endl;
                 if (this->pointer_)
                 {
@@ -113 +107 @@
             inline const SharedPtr& operator=(const SharedPtr& other)
             {
-//                COUT(0) << "SharedPtr= (1)" << std::endl;
                 SharedPtr(other).swap(*this);
                 return *this;
@@ -121 +114 @@
             inline const SharedPtr& operator=(const SharedPtr<O>& other)
             {
-//                COUT(0) << "SharedPtr= (2)" << std::endl;
                 SharedPtr(other).swap(*this);
                 return *this;
@@ -160 +152 @@
             inline SharedPtr(T* pointer, int* counter, SharedPtrDestroyer* destroyer) : pointer_(pointer), counter_(counter), destroyer_(destroyer)
             {
-//                COUT(0) << "SharedPtr (5): " << this->pointer_ << std::endl;
                 if (this->pointer_)
                     ++(*this->counter_);
@@ -176 +167 @@
             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->()); }