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

Timestamp:

Dec 29, 2015, 5:16:28 PM (9 years ago)

Author:

landauf

Message:

for all non-copyable classes (i.e. those with deleted copy-constructor) I added also a deleted assignment operator

Location:

code/branches/cpp11_v2/src/orxonox

Files:

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

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

@@ -59 +59 @@
 
         private:
+            // non-copyable:
             CameraManager(const CameraManager&) = delete;
+            CameraManager& operator=(const CameraManager&) = delete;
 
             std::list<Camera*>    cameraList_;

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

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

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

@@ -53 +53 @@
 
         protected:
+            // non-copyable:
             ChatManager(const ChatManager&) = delete;
+            ChatManager& operator=(const ChatManager&) = delete;
 
             virtual void incomingChat(const std::string& message, unsigned int sourceID) override;