Changeset 10990 for code/branches/cpp11_v2/src/orxonox

Timestamp:

Dec 29, 2015, 4:47:42 PM (9 years ago)

Author:

landauf

Message:

use '= delete' to explicitly delete unimplemented copy-constructors (for non-copyable classes).
use '= default' to explicitly implement default constructors/destructors.

Location:

code/branches/cpp11_v2/src/orxonox

Files:

• CameraManager.h (modified) (1 diff)
• LevelManager.h (modified) (1 diff)
• chat/ChatManager.h (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/CameraManager.h

@@ -59 +59 @@
 
         private:
-            CameraManager(const CameraManager&); // don't use
+            CameraManager(const CameraManager&) = delete;
 
             std::list<Camera*>    cameraList_;

code/branches/cpp11_v2/src/orxonox/LevelManager.h

@@ -109 +109 @@
 
         private:
-            LevelManager(const LevelManager&);
+            LevelManager(const LevelManager&) = delete;
 
             void activateNextLevel(); //!< Activate the next level.

code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h

@@ -47 +47 @@
         public:
             ChatManager();
-            virtual ~ChatManager() {}
+            virtual ~ChatManager() = default;
 
             static void message(const std::string& message, unsigned int targetID = NETWORK_PEER_ID_BROADCAST);
@@ -53 +53 @@
 
         protected:
-            ChatManager(const ChatManager&);
+            ChatManager(const ChatManager&) = delete;
 
             virtual void incomingChat(const std::string& message, unsigned int sourceID) override;