[Orxonox-commit 3216] r7909 - in code/forks/sandbox_light: cmake src/external/ogremath

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-02-17 17:15:53 +0100 (Thu, 17 Feb 2011)
New Revision: 7909

Modified:
   code/forks/sandbox_light/cmake/LibraryConfig.cmake
   code/forks/sandbox_light/src/external/ogremath/OgrePrerequisites.h
Log:
Added missing std includes to ogremath and removed boost thread and date_time dependencies.

Modified: code/forks/sandbox_light/cmake/LibraryConfig.cmake
===================================================================
--- code/forks/sandbox_light/cmake/LibraryConfig.cmake	2011-02-17 04:47:22 UTC (rev 7908)
+++ code/forks/sandbox_light/cmake/LibraryConfig.cmake	2011-02-17 16:15:53 UTC (rev 7909)
@@ -102,7 +102,7 @@
 SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0 1.40 1.40.0
                               1.41 1.41.0 1.42 1.42.0 1.43 1.43.0 1.44 1.44.0)
 IF( NOT TARDIS )
-  FIND_PACKAGE(Boost 1.35 REQUIRED thread filesystem system date_time)
+  FIND_PACKAGE(Boost 1.35 REQUIRED filesystem system)
 ENDIF()
 # No auto linking, so this option is useless anyway
 MARK_AS_ADVANCED(Boost_LIB_DIAGNOSTIC_DEFINITIONS)

Modified: code/forks/sandbox_light/src/external/ogremath/OgrePrerequisites.h
===================================================================
--- code/forks/sandbox_light/src/external/ogremath/OgrePrerequisites.h	2011-02-17 04:47:22 UTC (rev 7908)
+++ code/forks/sandbox_light/src/external/ogremath/OgrePrerequisites.h	2011-02-17 16:15:53 UTC (rev 7909)
@@ -31,6 +31,55 @@
 // Needed for OGRE_WCHAR_T_STRINGS below
 #include <string>
 
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <cstring>
+#include <cstdarg>
+#include <cmath>
+
+// STL containers
+#include <vector>
+#include <map>
+#include <string>
+#include <set>
+#include <list>
+#include <deque>
+#include <queue>
+#include <bitset>
+
+// Note - not in the original STL, but exists in SGI STL and STLport
+// For gcc 4.3 see http://gcc.gnu.org/gcc-4.3/changes.html
+#if (OGRE_COMPILER == OGRE_COMPILER_GNUC) && !defined(STLPORT)
+#   if OGRE_COMP_VER >= 430
+#       include <tr1/unordered_map>
+#       include <tr1/unordered_set> 
+#   else
+#       include <ext/hash_map>
+#       include <ext/hash_set>
+#   endif
+#else
+#   if (OGRE_COMPILER == OGRE_COMPILER_MSVC) && !defined(STLPORT) && OGRE_COMP_VER >= 1600 // VC++ 10.0
+#    	include <unordered_map>
+#    	include <unordered_set>
+#	else
+#   	include <hash_set>
+#   	include <hash_map>
+#	endif
+#endif 
+
+// STL algorithms & functions
+#include <algorithm>
+#include <functional>
+#include <limits>
+
+// C++ Stream stuff
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <sstream>
+
 #if OGRE_COMPILER == OGRE_COMPILER_MSVC
 // Turn off warnings generated by long std templates
 // This warns about truncation to 255 characters in debug/browse info