- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/core/singleton/ScopedSingletonIncludes.h
r11052 r11054 71 71 */ 72 72 #define ManageScopedSingleton(className, scope, allowedToFail) \ 73 className* className::singletonPtr_s = NULL; \73 className* className::singletonPtr_s = nullptr; \ 74 74 static ScopedSingletonWrapper& className##ScopedSingletonWrapper \ 75 75 = (new orxonox::SI_SSW(new ClassScopedSingletonWrapper<className, allowedToFail>(#className), scope))->getWrapper() … … 87 87 ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; } 88 88 89 virtual void load() ;90 virtual void unload() ;89 virtual void load() override; 90 virtual void unload() override; 91 91 92 92 inline ScopedSingletonWrapper& getWrapper()
Note: See TracChangeset
for help on using the changeset viewer.