Changeset 10990 for code/branches/cpp11_v2/src/libraries/util

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

Files:

• Clock.h (modified) (1 diff)
• DestructionHelper.h (modified) (1 diff)
• ImplicitConversion.h (modified) (1 diff)
• Singleton.h (modified) (1 diff)
• output/ConsoleWriter.h (modified) (1 diff)
• output/LogWriter.h (modified) (1 diff)
• output/MemoryWriter.h (modified) (1 diff)
• output/OutputManager.h (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/util/Clock.h

@@ -102 +102 @@
 
     private:
-        /// Undefined
-        Clock(const Clock& instance);
+        Clock(const Clock&) = delete;
 
         Ogre::Timer*       timer_;       ///< Ogre timer object

code/branches/cpp11_v2/src/libraries/util/DestructionHelper.h

@@ -87 +87 @@
 
     private:
-        DestructionHelper(const DestructionHelper&); //!< Don't use (undefined)
+        DestructionHelper(const DestructionHelper&) = delete;
 
         T* object_;

code/branches/cpp11_v2/src/libraries/util/ImplicitConversion.h

@@ -68 +68 @@
     {
     private:
-        ImplicitConversion(); ImplicitConversion(const ImplicitConversion&); ~ImplicitConversion();
+        // static class, no instances allowed:
+        ImplicitConversion() = delete;
+        ImplicitConversion(const ImplicitConversion&) = delete;
+        ~ImplicitConversion() = delete;
         // Gets chosen only if there is an implicit conversion from FromType to ToType.
         static char test(ToType);

code/branches/cpp11_v2/src/libraries/util/Singleton.h

@@ -144 +144 @@
 
     private:
-        Singleton(const Singleton& rhs); //!< Don't use (undefined)
+        Singleton(const Singleton&) = delete;
     };
 }

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

@@ -53 +53 @@
         public:
             ConsoleWriter(std::ostream& outputStream);
-            ConsoleWriter(const ConsoleWriter&);
+            ConsoleWriter(const ConsoleWriter&) = delete;
             virtual ~ConsoleWriter();
 

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

@@ -57 +57 @@
         public:
             LogWriter();
-            LogWriter(const LogWriter&);
+            LogWriter(const LogWriter&) = delete;
             virtual ~LogWriter();
 

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

@@ -68 +68 @@
         public:
             MemoryWriter();
-            MemoryWriter(const MemoryWriter&);
+            MemoryWriter(const MemoryWriter&) = delete;
             virtual ~MemoryWriter();
 

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

@@ -67 +67 @@
         public:
             OutputManager();
-            OutputManager(const OutputManager&);
+            OutputManager(const OutputManager&) = delete;
             virtual ~OutputManager();