Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 7, 2008, 5:19:48 PM (16 years ago)
Author:
landauf
Message:

Super.h:

  • removed some commented lines
  • removed testfunction
Location:
code/branches/core3/src/core
Files:
3 edited

Legend:

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

    r1684 r1736  
    103103    };
    104104
    105     SUPER_FUNCTION(1, BaseObject, XMLPort, false);
    106     SUPER_FUNCTION(3, BaseObject, changedActivity, false);
    107     SUPER_FUNCTION(4, BaseObject, changedVisibility, false);
     105    SUPER_FUNCTION(0, BaseObject, XMLPort, false);
     106    SUPER_FUNCTION(2, BaseObject, changedActivity, false);
     107    SUPER_FUNCTION(3, BaseObject, changedVisibility, false);
    108108}
    109109
  • code/branches/core3/src/core/Namespace.cc

    r1684 r1736  
    6060    void Namespace::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6161    {
    62 //        BaseObject::XMLPort(xmlelement, mode);
    6362        SUPER(Namespace, XMLPort, xmlelement, mode);
    6463
  • code/branches/core3/src/core/Super.h

    r1687 r1736  
    105105                    if (!((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_) \
    106106                    { \
    107                         COUT(0) << "Added SuperFunctionCaller for " << #functionname << ": " << ClassIdentifier<T>::getIdentifier()->getName() << " <- " << ((ClassIdentifier<T>*)(*it))->getName() << std::endl; \
     107                        COUT(5) << "Added SuperFunctionCaller for " << #functionname << ": " << ClassIdentifier<T>::getIdentifier()->getName() << " <- " << ((ClassIdentifier<T>*)(*it))->getName() << std::endl; \
    108108                        ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = new SuperFunctionClassCaller_##functionname <T>; \
    109109                    } \
     
    218218
    219219    // (1/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    220     #define SUPER_testfunction(classname, functionname, ...) \
    221         SUPER_NOARGS(classname, functionname)
    222 
    223220    #define SUPER_XMLPort(classname, functionname, ...) \
    224221        SUPER_ARGS(classname, functionname, __VA_ARGS__)
     
    421418
    422419        // (2/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    423         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(0, testfunction, false)
     420        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(0, XMLPort, true, Element& xmlelement, XMLPort::Mode mode)
     421            (xmlelement, mode)
     422        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
     423
     424        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(1, tick, true, float dt)
     425            (dt)
     426        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
     427
     428        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(2, changedActivity, false)
    424429            ()
    425430        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    426431
    427         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(1, XMLPort, true, Element& xmlelement, XMLPort::Mode mode)
    428             (xmlelement, mode)
    429         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    430 
    431         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(2, tick, true, float dt)
    432             (dt)
    433         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    434 
    435         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(3, changedActivity, false)
    436             ()
    437         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    438 
    439         SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(4, changedVisibility, false)
     432        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(3, changedVisibility, false)
    440433            ()
    441434        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
     
    482475
    483476    // (3/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    484     SUPER_INTRUSIVE_DECLARATION(testfunction);
    485477    SUPER_INTRUSIVE_DECLARATION(XMLPort);
    486478    SUPER_INTRUSIVE_DECLARATION(tick);
Note: See TracChangeset for help on using the changeset viewer.