Changeset 7553 for code/branches/ois_update

Timestamp:

Oct 18, 2010, 11:20:32 PM (14 years ago)

Author:

rgrieder

Message:

Reverted intentional compiler errors generated in the last commit.
And commented erroneous line in Super.h for testing purposes.

Location:

code/branches/ois_update/src/libraries

Files:

• core/Super.h (modified) (2 diffs)
• util/Math.cc (modified) (1 diff)

code/branches/ois_update/src/libraries/core/Super.h

@@ -74 +74 @@
 #include "CorePrereqs.h"
 
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/expand.hpp>
-
 #include "util/Debug.h"
 #include "Event.h"
@@ -573 +570 @@
         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();
         }
 

code/branches/ois_update/src/libraries/util/Math.cc

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