[Orxonox-commit 2850] r7553 - in code/branches/ois_update/src/libraries: core util

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-18 23:20:32 +0200 (Mon, 18 Oct 2010)
New Revision: 7553

Modified:
   code/branches/ois_update/src/libraries/core/Super.h
   code/branches/ois_update/src/libraries/util/Math.cc
Log:
Reverted intentional compiler errors generated in the last commit.
And commented erroneous line in Super.h for testing purposes.

Modified: code/branches/ois_update/src/libraries/core/Super.h
===================================================================
--- code/branches/ois_update/src/libraries/core/Super.h	2010-10-17 20:50:43 UTC (rev 7552)
+++ code/branches/ois_update/src/libraries/core/Super.h	2010-10-18 21:20:32 UTC (rev 7553)
@@ -73,9 +73,6 @@
 
 #include "CorePrereqs.h"
 
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/expand.hpp>
-
 #include "util/Debug.h"
 #include "Event.h"
 
@@ -572,14 +569,11 @@
         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
         {
-            SuperFunctionCondition<0, T, 0, 0>::check();
+            //SuperFunctionCondition<0, T, 0, 0>::check();
         }
 
 

Modified: code/branches/ois_update/src/libraries/util/Math.cc
===================================================================
--- code/branches/ois_update/src/libraries/util/Math.cc	2010-10-17 20:50:43 UTC (rev 7552)
+++ code/branches/ois_update/src/libraries/util/Math.cc	2010-10-18 21:20:32 UTC (rev 7553)
@@ -40,14 +40,6 @@
 // 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