Context Navigation

util

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/libraries/util

Files:

-                      r10990
+                      r10992
     private:
+        // non-copyable:
         Clock(const Clock&) = delete;
+        Clock& operator=(const Clock&) = delete;
         Ogre::Timer*       timer_;       ///< Ogre timer object

-                      r10990
+                      r10992
     private:
+        // non-copyable:
         DestructionHelper(const DestructionHelper&) = delete;
+        DestructionHelper& operator=(const DestructionHelper&) = delete;
         T* object_;

-                      r10990
+                      r10992
         ImplicitConversion() = delete;
         ImplicitConversion(const ImplicitConversion&) = delete;
+        ImplicitConversion& operator=(const ImplicitConversion&) = delete;
         ~ImplicitConversion() = delete;
         // Gets chosen only if there is an implicit conversion from FromType to ToType.
         static char test(ToType);

-                      r10990
+                      r10992
     private:
+        // non-copyable:
         Singleton(const Singleton&) = delete;
+        Singleton& operator=(const Singleton&) = delete;
     };
+}

-                      r10990
+                      r10992
         public:
             ConsoleWriter(std::ostream& outputStream);
-            ConsoleWriter(const ConsoleWriter&) = delete;
             virtual ~ConsoleWriter();
 …
         private:
+            // non-copyable:
+            ConsoleWriter(const ConsoleWriter&) = delete;
+            ConsoleWriter& operator=(const ConsoleWriter&) = delete;
             std::ostream& outputStream_; ///< The ostream to which the console writer writes its output
             bool bEnabled_;              ///< If false, the instance will not write output to the console.

-                      r10990
+                      r10992
         public:
             LogWriter();
-            LogWriter(const LogWriter&) = delete;
             virtual ~LogWriter();
 …
         private:
+            // non-copyable:
+            LogWriter(const LogWriter&) = delete;
+            LogWriter& operator=(const LogWriter&) = delete;
             void openFile();
             void closeFile();

-                      r10990
+                      r10992
         public:
             MemoryWriter();
-            MemoryWriter(const MemoryWriter&) = delete;
             virtual ~MemoryWriter();
 …
         private:
+            // non-copyable:
+            MemoryWriter(const MemoryWriter&) = delete;
+            MemoryWriter& operator=(const MemoryWriter&) = delete;
             std::vector<Message> messages_; ///< Stores all output messages from the creation of this instance until disable() is called.
     };

-                      r10990
+                      r10992
         public:
             OutputManager();
-            OutputManager(const OutputManager&) = delete;
             virtual ~OutputManager();
 …
         private:
+            // non-copyable:
+            OutputManager(const OutputManager&) = delete;
+            OutputManager& operator=(const OutputManager&) = delete;
             void updateMasks();
             void updateCombinedLevelMask();

Note: See TracChangeset for help on using the changeset viewer.