[Orxonox-commit 2829] r7532 - in code/branches/ois_update/src/libraries: core util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-13 00:09:04 +0200 (Wed, 13 Oct 2010)
New Revision: 7532

Modified:
   code/branches/ois_update/src/libraries/core/Super.h
   code/branches/ois_update/src/libraries/util/Math.cc
Log:
Adding some compiler errors to test OS X stuff

Modified: code/branches/ois_update/src/libraries/core/Super.h
===================================================================
--- code/branches/ois_update/src/libraries/core/Super.h	2010-10-12 18:33:58 UTC (rev 7531)
+++ code/branches/ois_update/src/libraries/core/Super.h	2010-10-12 22:09:04 UTC (rev 7532)
@@ -73,6 +73,9 @@
 
 #include "CorePrereqs.h"
 
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/expand.hpp>
+
 #include "util/Debug.h"
 #include "Event.h"
 
@@ -569,6 +572,9 @@
         template <int functionnumber, class TT, int templatehack1, int templatehack2>
         friend struct SuperFunctionCondition;
 
+        class BOOST_PP_CAT(BOOST_PP_EXPAND(check), __Test) {};
+        struct BOOST_PP_CAT(BOOST_PP_EXPAND(check), __Test) {};
+
         // Creates the super-function-callers by calling the first SuperFunctionCondition check
         // This get's called within the initialization of an Identifier
         virtual void createSuperFunctionCaller() const

Modified: code/branches/ois_update/src/libraries/util/Math.cc
===================================================================
--- code/branches/ois_update/src/libraries/util/Math.cc	2010-10-12 18:33:58 UTC (rev 7531)
+++ code/branches/ois_update/src/libraries/util/Math.cc	2010-10-12 22:09:04 UTC (rev 7532)
@@ -40,6 +40,14 @@
 // Do not remove this include, it avoids linker errors.
 #include "mbool.h"
 
+#ifdef ORXONOX_ARCH_64
+class IsArch64 {};
+struct IsArch64 {};
+#else
+class IsArch32 {};
+struct IsArch32 {};
+#endif
+
 namespace orxonox
 {
 #if OGRE_VERSION < 0x010603