Changeset 6417 for code/trunk/src/libraries/core/WeakPtr.h

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/WeakPtr.h (modified) (5 diffs)

code/trunk/src/libraries/core/WeakPtr.h

@@ -44 +44 @@
     {
         friend class OrxonoxClass;
-        
+
         public:
             inline WeakPtr() : pointer_(0), base_(0), callback_(0)
@@ -79 +79 @@
                 if (this->callback_)
                     delete this->callback_;
-                    
-            }
-            
+
+            }
+
             inline const WeakPtr& operator=(int)
             {
@@ -145 +145 @@
                 if (other.base_)
                     other.base_->unregisterWeakPtr(&other);
-                
+
                 {
                     T* temp = this->pointer_;
@@ -167 +167 @@
                 WeakPtr().swap(*this);
             }
-            
+
             inline void setCallback(Functor* callback)
             {
                 this->callback_ = callback;
             }
-            
+
             inline Functor* getFunctor() const
             {
@@ -186 +186 @@
                     (*this->callback_)();
             }
-        
+
             T* pointer_;
             OrxonoxClass* base_;