Changeset 7909

Timestamp:

Feb 17, 2011, 5:15:53 PM (14 years ago)

Author:

rgrieder

Message:

Added missing std includes to ogremath and removed boost thread and date_time dependencies.

Location:

code/forks/sandbox_light

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• src/external/ogremath/OgrePrerequisites.h (modified) (1 diff)

code/forks/sandbox_light/cmake/LibraryConfig.cmake

@@ -103 +103 @@
                               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

code/forks/sandbox_light/src/external/ogremath/OgrePrerequisites.h

@@ -31 +31 @@
 // 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