Changeset 11098 for code/trunk/src/libraries/util/MultiType.h

Timestamp:

Jan 26, 2016, 8:32:16 PM (8 years ago)

Author:

muemart

Message:

Minor C++11 improvements:

• Drop ImplicitConversion.h in favor of std::is_convertible.
• Move constructor & assignment for MultiType and SubString. I'm not sure if the MultiType should convert types when moving. Currently it doesn't, because otherwise it would have no benefit over copying.
• Use standard library functions for sleeping.

File:

• code/trunk/src/libraries/util/MultiType.h (modified) (3 diffs)

code/trunk/src/libraries/util/MultiType.h

@@ -100 +100 @@
 #include <cassert>
 #include <string>
+#include <utility>
 #include <OgreVector2.h>
 #include <OgreVector3.h>
@@ -310 +311 @@
             /// Copyconstructor: Assigns value and type of the other MultiType.
             inline MultiType(const MultiType& other) : value_(nullptr) { this->set(other); }
+            /// Moveconstructor: Moves the value and its type from the other MultiType
+            inline MultiType(MultiType&& other)      : value_(nullptr) { std::swap(this->value_, other.value_); };
 
             /// Destructor: Deletes the MT_Value.
@@ -320 +323 @@
             /// Assigns the value of the other MultiType and converts it to the current type of the MultiType.
             inline                       MultiType& operator=(const MultiType& other) { this->set(other); return (*this); }
+            /// Moves the value and the type of the other MultiType to this one.
+            inline                       MultiType& operator=(MultiType&& other)      { std::swap(this->value_, other.value_); return (*this); }
 
             /// Assigns the given value and converts it to the current type.