Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 20, 2010, 5:35:10 PM (14 years ago)
Author:
youngk
Message:

Changes to Super.h: Macro collision. Again.

Location:
code/branches/ois_update/src/libraries/core
Files:
3 edited

Legend:

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

    r7570 r7571  
    238238    };
    239239
     240#ifdef csadasdasf
     241struct CompilerError
     242{
     243   void CompilerError() {}
     244};
     245#endif
     246
    240247    template <class T, int templatehack2>
    241248    struct SuperFunctionCondition<0, T, 0, templatehack2>
    242249    {
    243         static void verify()
     250        static void superCheck()
    244251        {
    245252            SuperFunctionCondition<0, T, 0, templatehack2>::apply(static_cast<T*>(0));
    246             SuperFunctionCondition<0 + 1, T, 0, templatehack2>::verify();
     253            SuperFunctionCondition<0 + 1, T, 0, templatehack2>::superCheck();
    247254        }
    248255       
  • code/branches/ois_update/src/libraries/core/PathConfig.cc

    r6417 r7571  
    9595#elif defined(ORXONOX_PLATFORM_APPLE)
    9696        char buffer[1024];
    97         unsigned long path_len = 1023;
     97        uint32_t path_len = 1023;
    9898        if (_NSGetExecutablePath(buffer, &path_len))
    9999            ThrowException(General, "Could not retrieve executable path.");
  • code/branches/ois_update/src/libraries/core/Super.h

    r7564 r7571  
    9494        struct SuperFunctionCondition<functionnumber, T, 0, templatehack2> \
    9595        { \
    96             static void verify() \
     96            static void superCheck() \
    9797            { \
    9898                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0)); \
    99                 SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::verify(); \
     99                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck(); \
    100100            } \
    101101            \
     
    132132        struct SuperFunctionCondition<functionnumber, baseclass, 0, templatehack2> \
    133133        { \
    134             static void verify() \
    135             { \
    136                 SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::verify(); \
     134            static void superCheck() \
     135            { \
     136                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::superCheck(); \
    137137            } \
    138138        };
     
    150150        struct SuperFunctionCondition<functionnumber, T, 0, templatehack2>
    151151        {
    152             static void verify()
     152            static void superCheck()
    153153            {
    154154                // This call to the apply-function is the whole check. By calling the function with
     
    156156                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0));
    157157
    158                 // Go go the verify for of next super-function (functionnumber + 1)
    159                 SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::verify();
     158                // Go go the superCheck for of next super-function (functionnumber + 1)
     159                SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck();
    160160            }
    161161
     
    202202        struct SuperFunctionCondition<functionnumber, baseclass, 0, templatehack2> \
    203203        { \
    204             // The verify function acts like the fallback - it advances to the check for the next super-function (functionnumber + 1)
    205             static void verify() \
    206             { \
    207                 SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::verify(); \
     204            // The superCheck function acts like the fallback - it advances to the check for the next super-function (functionnumber + 1)
     205            static void superCheck() \
     206            { \
     207                SuperFunctionCondition<functionnumber + 1, baseclass, 0, templatehack2>::superCheck(); \
    208208            } \
    209209        };
     
    303303        struct SuperFunctionCondition
    304304        {
    305             static void verify() {}
     305            static void superCheck() {}
    306306        };
    307307
     
    338338            struct SuperFunctionCondition<functionnumber, T, templatehack1, templatehack2> \
    339339            { \
    340                 static void verify() \
     340                static void superCheck() \
    341341                { \
    342                     SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::verify(); \
     342                    SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::superCheck(); \
    343343                } \
    344344            }; \
     
    421421            // If this function gets called, the header-file of the super function is not
    422422            // included, so this fallback template (templatehack not specialized) is used
    423             static void verify()
     423            static void superCheck()
    424424            {
    425425                // Calls the condition-check of the next super-function (functionnumber + 1)
    426                 SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::verify();
     426                SuperFunctionCondition<functionnumber + 1, T, templatehack1, templatehack2>::superCheck();
    427427            }
    428428        };
     
    574574        virtual void createSuperFunctionCaller() const
    575575        {
    576             //SuperFunctionCondition<0, T, 0, 0>::verify();
     576            //SuperFunctionCondition<0, T, 0, 0>::superCheck();
    577577        }
    578578
Note: See TracChangeset for help on using the changeset viewer.