Changeset 346 for code/branches/FICN/src/network/ClientConnection.cc

Timestamp:

Nov 29, 2007, 4:21:30 PM (18 years ago)

Author:

rgrieder

Message:

• adjusted the entire source to compile under windows visual studio too:
• added some ugly conversions
• changed some illegal code pieces (gcc however accepted it)
• added a few files from reto's framework to evade linker errors (no more dynamic linking)
• inserted some 'return true' to justify the return type
• excluded the levelLoader in the orxonox.cc (couldn't make it work, parsing error)
• wrote about 5 code #branches to compensate for missing usleep() under windows

Location:

code/branches/FICN

Files:

• . (modified) (1 prop)
• src/network/ClientConnection.cc (modified) (2 diffs)

code/branches/FICN/src/network/ClientConnection.cc

@@ -12 +12 @@
 #include "ClientConnection.h"
 
+// workaround for usleep(int) under windows
+#ifdef WIN32
+#include "winbase.h"
+#endif
+
 namespace network{
 
-  boost::thread_group network_threads;
+  static boost::thread_group network_threads;
 
   ClientConnection::ClientConnection(int port, std::string address){
@@ -34 +39 @@
   bool ClientConnection::waitEstablished(int milisec){
     for(int i=0; i<=milisec && !established; i++)
+// under windows, use Sleep(milliseconds) instead of usleep(microseconds)
+#ifdef WIN32
+      Sleep(1);
+#else
       usleep(1000);
+#endif
     return established;
   }