Changeset 11098

Timestamp:

Jan 26, 2016, 8:32:16 PM (9 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.

Location:

code/trunk/src/libraries/util

Files:

• Convert.h (modified) (2 diffs)
• ImplicitConversion.h (deleted)
• MultiType.h (modified) (3 diffs)
• Sleep.cc (modified) (2 diffs)
• SubString.h (modified) (2 diffs)

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

@@ -128 +128 @@
 #include <sstream>
 #include <typeinfo>
+#include <type_traits>
 #include <loki/TypeManip.h>
 
 #include "Output.h"
-#include "ImplicitConversion.h"
 
 // disable warnings about possible loss of data
@@ -308 +308 @@
     struct ConverterExplicit
     {
-        enum { probe = ImplicitConversion<FromType, ToType>::exists };
+        static constexpr bool probe = std::is_convertible<FromType, ToType>::value;
         ORX_FORCEINLINE static bool convert(ToType* output, const FromType& input)
         {

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.

code/trunk/src/libraries/util/Sleep.cc

@@ -30 +30 @@
 @file
 @brief
-    Implementation of three sleep functions. Avoids including windows.h
+    Implementation of three sleep functions.
 */
 
 #include "Sleep.h"
-#include "Output.h"
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
-#ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef min
-#undef max
+#include <chrono>
+#include <thread>
 
 namespace orxonox
@@ -48 +42 @@
     void usleep(unsigned long microseconds)
     {
-        //if (microseconds < 1000)
-        //    orxout(internal_warning) << "Windows cannot sleep less than 1ms, ignoring" << endl;
-        Sleep(microseconds / 1000);
+        std::this_thread::sleep_for(std::chrono::microseconds(microseconds));
     }
 
     void msleep(unsigned long milliseconds)
     {
-        Sleep(milliseconds);
+        std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
     }
 
     void sleep(unsigned long seconds)
     {
-        Sleep(seconds * 1000);
+        std::this_thread::sleep_for(std::chrono::seconds(seconds));
     }
 }
-
-#else /* Linux/Apple */
-#include <unistd.h>
-
-namespace orxonox
-{
-    void usleep(unsigned long usec)
-    {
-        ::usleep(usec);
-    }
-    void msleep(unsigned long msec)
-    {
-        ::usleep(msec * 1000);
-    }
-    void sleep(unsigned long sec)
-    {
-        ::usleep(sec * 1000000);
-    }
-}
-
-#endif

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

@@ -115 +115 @@
     public:
         SubString();
+        /// Copy constructor
+        SubString(const SubString& other) = default;
+        /// Move constructor
+        SubString(SubString&& other) = default;
         SubString(const std::string& line,
                   const std::string& delimiters = SubString::WhiteSpaces,
@@ -133 +137 @@
         // operate on the SubString
         SubString& operator=(const SubString& other);
+        /// Move assignment
+        SubString& operator=(SubString&& other) = default;
         bool operator==(const SubString& other) const;
         bool compare(const SubString& other, size_t length = std::string::npos) const;