Changeset 10745 for code/branches/cpp11_v2/src/libraries/util/SharedPtr.h

Timestamp:

Nov 1, 2015, 10:06:23 PM (10 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

File:

• code/branches/cpp11_v2/src/libraries/util/SharedPtr.h (modified) (2 diffs)

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