[Orxonox-commit 680] r3212 - in branches/netp5/src: core orxonox util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-23 15:45:04 +0200 (Tue, 23 Jun 2009)
New Revision: 3212

Modified:
   branches/netp5/src/core/Core.cc
   branches/netp5/src/core/CorePrecompiledHeaders.h
   branches/netp5/src/orxonox/OrxonoxPrecompiledHeaders.h
   branches/netp5/src/util/Clipboard.cc
   branches/netp5/src/util/Math.h
   branches/netp5/src/util/Sleep.cc
Log:
Refined PCH files a bit.

Modified: branches/netp5/src/core/Core.cc
===================================================================
--- branches/netp5/src/core/Core.cc	2009-06-23 10:37:53 UTC (rev 3211)
+++ branches/netp5/src/core/Core.cc	2009-06-23 13:45:04 UTC (rev 3212)
@@ -46,6 +46,8 @@
 #    define WIN32_LEAN_AND_MEAN
 #  endif
 #  include <windows.h>
+#  undef min
+#  undef max
 #elif defined(ORXONOX_PLATFORM_APPLE)
 #  include <sys/param.h>
 #  include <mach-o/dyld.h>

Modified: branches/netp5/src/core/CorePrecompiledHeaders.h
===================================================================
--- branches/netp5/src/core/CorePrecompiledHeaders.h	2009-06-23 10:37:53 UTC (rev 3211)
+++ branches/netp5/src/core/CorePrecompiledHeaders.h	2009-06-23 13:45:04 UTC (rev 3212)
@@ -34,42 +34,44 @@
 
 #include "CorePrereqs.h"
 
+#include <cassert>
 #include <fstream>
 #include <iostream>
 #include <list>
+#include <locale>
 #include <map>
+#include <queue>
 #include <set>
 #include <sstream>
+#include <stack>
 #include <string>
 #include <vector>
 
 
 #ifdef ORXONOX_COMPILER_MSVC
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef max
-#undef min
+#include <OgreMath.h>
+#include <OgreVector2.h>
+#include <OgreVector3.h>
+#include <OgreVector4.h>
+#include <OgreQuaternion.h>
+#include <OgreColourValue.h>
 
-#include <ois/OISKeyboard.h>
-#include <ois/OISMouse.h>
-#include <ois/OISJoyStick.h>
-#include <tinyxml/ticpp.h>
+#include <boost/shared_ptr.hpp> // 12
+#include <boost/preprocessor/cat.hpp> // 12
 // Included by both filesystem and thread but still relatively small
-#include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_facade.hpp> // 10
 
+// Just in case some header included windows.h
+#undef min
+#undef max
+
 #endif /* ORXONOX_COMPILER_MSVC */
 
 
-#include "util/Convert.h"
 #include "util/Debug.h"
-#include "util/Exception.h"
 #include "util/Math.h"
-#include "util/mbool.h"
 #include "util/MultiType.h"
-#include "util/OrxAssert.h"
-#include "util/OrxEnum.h"
-#include "util/String.h"
 #include "util/SubString.h"
 
 

Modified: branches/netp5/src/orxonox/OrxonoxPrecompiledHeaders.h
===================================================================
--- branches/netp5/src/orxonox/OrxonoxPrecompiledHeaders.h	2009-06-23 10:37:53 UTC (rev 3211)
+++ branches/netp5/src/orxonox/OrxonoxPrecompiledHeaders.h	2009-06-23 13:45:04 UTC (rev 3212)
@@ -34,6 +34,7 @@
 
 #include "OrxonoxPrereqs.h"
 
+#include <cassert>
 #include <deque>
 #include <fstream>
 #include <iostream>
@@ -83,8 +84,6 @@
 #include "util/Exception.h"
 #include "util/Math.h"
 #include "util/OgreForwardRefs.h"
-#include "util/OrxAssert.h"
-#include "util/String.h"
 #include "util/SubString.h"
 
 #include "core/BaseObject.h"

Modified: branches/netp5/src/util/Clipboard.cc
===================================================================
--- branches/netp5/src/util/Clipboard.cc	2009-06-23 10:37:53 UTC (rev 3211)
+++ branches/netp5/src/util/Clipboard.cc	2009-06-23 13:45:04 UTC (rev 3212)
@@ -41,7 +41,12 @@
 // Windows //
 /////////////
 
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#undef min
+#undef max
 #include "Debug.h"
 
 namespace orxonox

Modified: branches/netp5/src/util/Math.h
===================================================================
--- branches/netp5/src/util/Math.h	2009-06-23 10:37:53 UTC (rev 3211)
+++ branches/netp5/src/util/Math.h	2009-06-23 13:45:04 UTC (rev 3212)
@@ -46,10 +46,15 @@
 #include <OgreQuaternion.h>
 #include <OgreColourValue.h>
 
-// Certain headers might define min and max macros
-#if defined(max) || defined(min) || defined(sgn) || defined(clamp) || defined(square) || defined(mod)
-#  error An inline math function was overridden by a macro
-#endif
+// Certain headers might define unwanted macros...
+#undef max
+#undef min
+#undef sgn
+#undef clamp
+#undef sqrt
+#undef square
+#undef mod
+#undef rnd
 
 namespace orxonox
 {

Modified: branches/netp5/src/util/Sleep.cc
===================================================================
--- branches/netp5/src/util/Sleep.cc	2009-06-23 10:37:53 UTC (rev 3211)
+++ branches/netp5/src/util/Sleep.cc	2009-06-23 13:45:04 UTC (rev 3212)
@@ -36,7 +36,12 @@
 #include "Debug.h"
 
 #ifdef ORXONOX_PLATFORM_WINDOWS
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+#undef min
+#undef max
 
 namespace orxonox
 {