Changeset 2171 for code/trunk/src/util/Sleep.h

Timestamp:

Nov 10, 2008, 12:05:03 AM (15 years ago)

Author:

landauf

Message:

merged revisions 2111-2170 from objecthierarchy branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Sleep.h (modified) (2 diffs)

code/trunk/src/util/Sleep.h

@@ -41 +41 @@
 #include <winbase.h>
 
-inline void usleep(DWORD dwMicroseconds)
+namespace orxonox
 {
-  Sleep(dwMicroseconds / 1000);
-}
+    inline void usleep(DWORD dwMicroseconds)
+    {
+        Sleep(dwMicroseconds / 1000);
+    }
 
-inline void msleep(DWORD dwMilliseconds)
-{
-  Sleep(dwMilliseconds);
-}
+    inline void msleep(DWORD dwMilliseconds)
+    {
+        Sleep(dwMilliseconds);
+    }
 
-inline void sleep(DWORD dwSeconds)
-{
-  Sleep(dwSeconds * 1000);
+    inline void sleep(DWORD dwSeconds)
+    {
+        Sleep(dwSeconds * 1000);
+    }
 }
 
@@ -60 +63 @@
 #include <unistd.h>
 
-inline void msleep(unsigned long msec)
+namespace orxonox
 {
-  usleep(msec * 1000);
+    inline void usleep(unsigned long usec)
+    {
+        ::usleep(usec);
+    }
+    inline void msleep(unsigned long msec)
+    {
+        ::usleep(msec * 1000);
+    }
+    inline void sleep(unsigned long sec)
+    {
+        ::usleep(sec * 1000000);
+    }
 }