Changeset 1846 for code/branches/orxonox_tutorial/src/util

Timestamp:

Sep 28, 2008, 2:27:03 PM (16 years ago)

Author:

rgrieder

Message:

Merged Revisions 1831 - 1845 to tutorial. This is an update from the trunk.

Location:

code/branches/orxonox_tutorial

Files:

• . (modified) (1 prop)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/Convert.h (modified) (1 diff)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/Math.h (modified) (1 diff)
• src/util/Sleep.h (modified) (1 diff)
• src/util/XMLIncludes.h (deleted)

code/branches/orxonox_tutorial/src/util/CMakeLists.txt

@@ -20 +20 @@
 TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
 )

code/branches/orxonox_tutorial/src/util/Convert.h

@@ -39 +39 @@
 #include <string>
 #include <sstream>
+#include <typeinfo>
 
 #include "Math.h"

code/branches/orxonox_tutorial/src/util/Math.h

@@ -220 +220 @@
 inline _UtilExport float rnd()
 {
-    return ((float)rand() / (RAND_MAX + 1));
+    return rand() / (RAND_MAX + 1.0);
 }
 

code/branches/orxonox_tutorial/src/util/Sleep.h

@@ -39 +39 @@
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
-
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include <winbase.h>
 
 inline void usleep(DWORD dwMicroseconds)