Changeset 9348 for code/trunk/src/libraries/core/Super.h
- Timestamp:
- Aug 30, 2012, 11:08:17 PM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 .project 1 2 build 2 3 codeblocks 4 dependencies 3 5 vs 4 dependencies
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
code/trunk/src/libraries/core/Super.h
r8866 r9348 280 280 SUPER_NOARGS(classname, functionname) 281 281 282 #define SUPER_clone(classname, functionname, ...) \283 SUPER_ARGS(classname, functionname, __VA_ARGS__)284 285 282 #define SUPER_changedCarrier(classname, functionname, ...) \ 286 283 SUPER_NOARGS(classname, functionname) … … 398 395 inline void operator()( SUPER_CALL_ARGUMENTS##hasarguments(__VA_ARGS__) ) \ 399 396 { \ 400 ( dynamic_cast<T*>(object))->T:: functionname397 (orxonox_cast<T*>(object))->T:: functionname 401 398 402 399 /* … … 508 505 inline void operator()( SUPER_CALL_ARGUMENTS##hasarguments(__VA_ARGS__) ) 509 506 { 510 ( dynamic_cast<T*>(object))->T:: functionname ( Call the function with it's arguments );507 (orxonox_cast<T*>(object))->T:: functionname ( Call the function with it's arguments ); 511 508 } 512 509 … … 566 563 SUPER_FUNCTION_GLOBAL_DECLARATION_PART2; 567 564 568 SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass*& item) 569 (item) 570 SUPER_FUNCTION_GLOBAL_DECLARATION_PART2; 571 572 SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedCarrier, false) 573 () 574 SUPER_FUNCTION_GLOBAL_DECLARATION_PART2; 575 576 SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(13, changedPickedUp, false) 565 SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, changedCarrier, false) 566 () 567 SUPER_FUNCTION_GLOBAL_DECLARATION_PART2; 568 569 SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedPickedUp, false) 577 570 () 578 571 SUPER_FUNCTION_GLOBAL_DECLARATION_PART2; … … 632 625 SUPER_INTRUSIVE_DECLARATION(changedGametype); 633 626 SUPER_INTRUSIVE_DECLARATION(changedUsed); 634 SUPER_INTRUSIVE_DECLARATION(clone);635 627 SUPER_INTRUSIVE_DECLARATION(changedCarrier); 636 628 SUPER_INTRUSIVE_DECLARATION(changedPickedUp);
Note: See TracChangeset
for help on using the changeset viewer.