Changeset 2773 for code/trunk/src/util

Timestamp:

Mar 11, 2009, 4:06:31 PM (16 years ago)

Author:

rgrieder

Message:

Removed all enet and boost includes from header files in the network library.

• Reduces dependencies
• Minimises problems with windows.h
• Speeds up the compiling process a little bit (probably negligible)
• Also removes ugly WIN32_LEAN_AND_MEAN declarations before every enet.h include in the network library.

Removed windows.h header from util/Sleep.h by adding Sleep.cc

Location:

code/trunk/src/util

Files:

• CMakeLists.txt (modified) (1 diff)
• Sleep.cc (added)
• Sleep.h (modified) (2 diffs)

code/trunk/src/util/CMakeLists.txt

@@ -47 +47 @@
   OutputHandler.cc
   SignalHandler.cc
+  Sleep.cc
   String.cc
   SubString.cc

code/trunk/src/util/Sleep.h

@@ -30 +30 @@
  @file
  @brief
-    Functions for using sleep() and usleep() under windows.
+    Functions for using sleep() and usleep() on windows.
  */
 
@@ -38 +38 @@
 #include "UtilPrereqs.h"
 
-#ifdef ORXONOX_PLATFORM_WINDOWS
-#include <winbase.h>
-
 namespace orxonox
 {
-    inline void usleep(DWORD dwMicroseconds)
-    {
-        Sleep(dwMicroseconds / 1000);
-    }
-
-    inline void msleep(DWORD dwMilliseconds)
-    {
-        Sleep(dwMilliseconds);
-    }
-
-    inline void sleep(DWORD dwSeconds)
-    {
-        Sleep(dwSeconds * 1000);
-    }
+    _UtilExport void usleep(unsigned long microseconds);
+    _UtilExport void msleep(unsigned long milliseconds);
+    _UtilExport void sleep (unsigned long seconds);
 }
 
-#else /* Linux/Apple */
-
-#include <unistd.h>
-
-namespace orxonox
-{
-    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);
-    }
-}
-
-#endif
-
 #endif /* _Sleep_H__ */