Changeset 11098 for code/trunk/src/libraries/util/Sleep.cc

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/Sleep.cc (modified) (2 diffs)

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