Changeset 10768 for code/branches/cpp11_v2/src/libraries/core/class/Super.h
- Timestamp:
- Nov 6, 2015, 10:54:34 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/core/class/Super.h
r10624 r10768 94 94 static void superCheck() \ 95 95 { \ 96 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>( 0)); \96 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(nullptr)); \ 97 97 SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck(); \ 98 98 } \ … … 108 108 { \ 109 109 delete ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_; \ 110 ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = 0; \110 ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = nullptr; \ 111 111 ((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ = false; \ 112 112 } \ … … 154 154 // This call to the apply-function is the whole check. By calling the function with 155 155 // a T* pointer, the right function get's called. 156 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>( 0));156 SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(nullptr)); 157 157 158 158 // Go go the superCheck for of next super-function (functionnumber + 1) … … 178 178 // Delete the fallback caller an prepare to get a real caller 179 179 delete ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_; 180 ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = 0;180 ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = nullptr; 181 181 ((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ = false; 182 182 }
Note: See TracChangeset
for help on using the changeset viewer.