Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ois_update/src/libraries/core/Super.h

    r7532 r7553  
    7474#include "CorePrereqs.h"
    7575
    76 #include <boost/preprocessor/cat.hpp>
    77 #include <boost/preprocessor/expand.hpp>
    78 
    7976#include "util/Debug.h"
    8077#include "Event.h"
     
    573570        friend struct SuperFunctionCondition;
    574571
    575         class BOOST_PP_CAT(BOOST_PP_EXPAND(check), __Test) {};
    576         struct BOOST_PP_CAT(BOOST_PP_EXPAND(check), __Test) {};
    577 
    578572        // Creates the super-function-callers by calling the first SuperFunctionCondition check
    579573        // This get's called within the initialization of an Identifier
    580574        virtual void createSuperFunctionCaller() const
    581575        {
    582             SuperFunctionCondition<0, T, 0, 0>::check();
     576            //SuperFunctionCondition<0, T, 0, 0>::check();
    583577        }
    584578
  • code/branches/ois_update/src/libraries/util/Math.cc

    r7532 r7553  
    4040// Do not remove this include, it avoids linker errors.
    4141#include "mbool.h"
    42 
    43 #ifdef ORXONOX_ARCH_64
    44 class IsArch64 {};
    45 struct IsArch64 {};
    46 #else
    47 class IsArch32 {};
    48 struct IsArch32 {};
    49 #endif
    5042
    5143namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.