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

Timestamp:

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

Author:

landauf

Message:

some cleanup in SharedPtr and its relatives

File:

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

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->()); }