Changeset 10745 for code/branches/cpp11_v2/src/libraries

Timestamp:

Nov 1, 2015, 10:06:23 PM (9 years ago)

Author:

landauf

Message:

added move-constructor for StrongPtr and SharedPtr. for WeakPtr this is not useful because the weakPtr is registered in Destroyable, so a copy-constructor must be used anyway

Location:

code/branches/cpp11_v2/src/libraries

Files:

• core/object/StrongPtr.h (modified) (2 diffs)
• core/object/WeakPtr.h (modified) (1 diff)
• util/SharedPtr.h (modified) (2 diffs)

code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h

@@ -172 +172 @@
             }
 
+            /// Move-constructor
+            inline StrongPtr(StrongPtr&& other) : pointer_(other.pointer_), base_(other.base_)
+            {
+                other.pointer_ = nullptr;
+                other.base_ = nullptr;
+            }
+
             /// Destructor: Decrements the reference counter.
             inline ~StrongPtr()
@@ -187 +194 @@
 
             /// Assigns the wrapped pointer of another StrongPtr.
-            inline StrongPtr& operator=(const StrongPtr& other)
-            {
-                StrongPtr(other).swap(*this);
+            inline StrongPtr& operator=(StrongPtr other)
+            {
+                other.swap(*this);
                 return *this;
             }

code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h

@@ -137 +137 @@
 
             /// Assigns the wrapped pointer of another WeakPtr.
-            inline WeakPtr& operator=(const WeakPtr& other)
-            {
-                WeakPtr(other).swap(*this);
+            inline WeakPtr& operator=(WeakPtr other)
+            {
+                other.swap(*this);
                 return *this;
             }

code/branches/cpp11_v2/src/libraries/util/SharedPtr.h

@@ -245 +245 @@
             }
 
+            /// Move-constructor, this SharedPtr now points to the same object like the other SharedPtr did before
+            inline SharedPtr(SharedPtr&& other) : pointer_(other.pointer_), counter_(other.counter_)
+            {
+                other.pointer_ = nullptr;
+                other.counter_ = nullptr;
+            }
+
             /// Destructor, decrements the counter and deletes the object if the counter becomes zero.
             inline ~SharedPtr()
@@ -261 +268 @@
 
             /// Assigns a new object, decrements the counter of the old object, increments the counter of the new object.
-            inline SharedPtr& operator=(const SharedPtr& other)
-            {
-                SharedPtr(other).swap(*this);
+            inline SharedPtr& operator=(SharedPtr other)
+            {
+                other.swap(*this);
                 return *this;
             }