Changeset 10817 for code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h
- Timestamp:
- Nov 19, 2015, 11:40:28 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h
r8706 r10817 44 44 static void printObjects(); 45 45 46 void activate() ;47 void deactivate() ;48 void update(const Clock& time) ;46 void activate() override; 47 void deactivate() override; 48 void update(const Clock& time) override; 49 49 50 50 // this has to be public because proteced triggers a bug in msvc … … 59 59 60 60 protected: 61 virtual void changedTimeFactor(float factor_new, float factor_old) ;61 virtual void changedTimeFactor(float factor_new, float factor_old) override; 62 62 63 63 private:
Note: See TracChangeset
for help on using the changeset viewer.