Changeset 11054 for code/branches/cpp11_v3/src/orxonox/gamestates/GSMasterServer.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSMasterServer.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/gamestates/GSMasterServer.h

@@ -45 +45 @@
       ~GSMasterServer();
 
-      void activate();
-      void deactivate();
-      void update(const Clock& time);
+      virtual void activate() override;
+      virtual void deactivate() override;
+      virtual void update(const Clock& time) override;
 
     private: