Changeset 10992 for code/branches/cpp11_v2/src/libraries/util/output

Timestamp:

Dec 29, 2015, 5:16:28 PM (10 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/output

Files:

• ConsoleWriter.h (modified) (2 diffs)
• LogWriter.h (modified) (2 diffs)
• MemoryWriter.h (modified) (2 diffs)
• OutputManager.h (modified) (2 diffs)

code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h

@@ -53 +53 @@
         public:
             ConsoleWriter(std::ostream& outputStream);
-            ConsoleWriter(const ConsoleWriter&) = delete;
             virtual ~ConsoleWriter();
 
@@ -66 +65 @@
 
         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.

code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h

@@ -57 +57 @@
         public:
             LogWriter();
-            LogWriter(const LogWriter&) = delete;
             virtual ~LogWriter();
 
@@ -73 +72 @@
 
         private:
+            // non-copyable:
+            LogWriter(const LogWriter&) = delete;
+            LogWriter& operator=(const LogWriter&) = delete;
+
             void openFile();
             void closeFile();

code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h

@@ -68 +68 @@
         public:
             MemoryWriter();
-            MemoryWriter(const MemoryWriter&) = delete;
             virtual ~MemoryWriter();
 
@@ -78 +77 @@
 
         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.
     };

code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h

@@ -67 +67 @@
         public:
             OutputManager();
-            OutputManager(const OutputManager&) = delete;
             virtual ~OutputManager();
 
@@ -115 +114 @@
 
         private:
+            // non-copyable:
+            OutputManager(const OutputManager&) = delete;
+            OutputManager& operator=(const OutputManager&) = delete;
+
             void updateMasks();
             void updateCombinedLevelMask();