Instead of declaring private copy/assignment list them as deleted and added move versions also as deleted

    * ACE/ace/ARGV.h:
    * ACE/ace/Activation_Queue.h:
    * ACE/ace/CDR_Size.h:
    * ACE/ace/CDR_Stream.h:
    * ACE/ace/DLL_Manager.h:
    * ACE/ace/Get_Opt.h:
    * ACE/ace/Log_Record.h:
    * ACE/ace/Message_Queue_NT.h:
    * ACE/ace/Message_Queue_Vx.h:
    * ACE/ace/Method_Request.h:
    * ACE/ace/Null_Mutex.h:
    * ACE/ace/Object_Manager.h:
    * ACE/ace/Object_Manager_Base.h:
    * ACE/ace/Process.h:
    * ACE/ace/Read_Buffer.h:
    * ACE/ace/Select_Reactor.h:
    * ACE/ace/TP_Reactor.h:
    * ACE/ace/XML_Utils/XML_Error_Handler.h:
    * TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h:
    * TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h:
    * TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h:
    * TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
    * TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h:
    * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
    * TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
    * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h:
    * TAO/tao/CDR.h:
    * TAO/tao/Connector_Registry.h:
    * TAO/tao/GIOP_Fragmentation_Strategy.h:
    * TAO/tao/MMAP_Allocator.h:
    * TAO/tao/Nested_Upcall_Guard.h:
    * TAO/tao/Null_Fragmentation_Strategy.h:
    * TAO/tao/Object_Ref_Table.h:
    * TAO/tao/On_Demand_Fragmentation_Strategy.h:
    * TAO/tao/Policy_Manager.h:
    * TAO/tao/Resource_Factory.h:
    * TAO/tao/TAO_Singleton_Manager.h:
    * TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h:

18 files changed, 80 insertions, 70 deletions

diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h
index 231056ee37b..72847df2eea 100644
--- a/ACE/ace/ARGV.h
+++ b/ACE/ace/ARGV.h
@@ -276,11 +276,10 @@ public:
   int add (CHAR_TYPE *argv[], bool quote_args = false);
 
 private:
-  /// Copy constructor not implemented.
-  ACE_UNIMPLEMENTED_FUNC (ACE_ARGV_T (const ACE_ARGV_T<CHAR_TYPE>&))
-
-  /// Assignment operator not implemented.
-  ACE_UNIMPLEMENTED_FUNC (ACE_ARGV_T operator= (const ACE_ARGV_T<CHAR_TYPE>&))
+  ACE_ARGV_T (const ACE_ARGV_T<CHAR_TYPE>&) = delete;
+  ACE_ARGV_T operator= (const ACE_ARGV_T<CHAR_TYPE>&) = delete;
+  ACE_ARGV_T (ACE_ARGV_T<CHAR_TYPE>&&) = delete;
+  ACE_ARGV_T operator= (ACE_ARGV_T<CHAR_TYPE>&&) = delete;
 
   /// Creates buf_ from the queue of added args, deletes previous buf_.
   int create_buf_from_queue (void);
diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h
index 2dbc37ab001..c01f0e9f64a 100644
--- a/ACE/ace/Activation_Queue.h
+++ b/ACE/ace/Activation_Queue.h
@@ -153,8 +153,10 @@ private:
   /// Allocation strategy of the message blocks.
   ACE_Allocator *data_block_allocator_;
 
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Activation_Queue &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_Activation_Queue (const ACE_Activation_Queue &))
+  void operator= (const ACE_Activation_Queue &) = delete;
+  ACE_Activation_Queue (const ACE_Activation_Queue &) = delete;
+  void operator= (ACE_Activation_Queue &&) = delete;
+  ACE_Activation_Queue (ACE_Activation_Queue &&) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/CDR_Size.h b/ACE/ace/CDR_Size.h
index c535924f1a0..4590230a336 100644
--- a/ACE/ace/CDR_Size.h
+++ b/ACE/ace/CDR_Size.h
@@ -125,9 +125,10 @@ public:
                size_t align);
 
 private:
-  /// disallow copying...
-  ACE_SizeCDR (const ACE_SizeCDR& rhs);
-  ACE_SizeCDR& operator= (const ACE_SizeCDR& rhs);
+  ACE_SizeCDR (const ACE_SizeCDR&) = delete;
+  ACE_SizeCDR& operator= (const ACE_SizeCDR&) = delete;
+  ACE_SizeCDR (ACE_SizeCDR&&) = delete;
+  ACE_SizeCDR& operator= (ACE_SizeCDR&&) = delete;
 
   ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x);
   ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x);
diff --git a/ACE/ace/CDR_Stream.h b/ACE/ace/CDR_Stream.h
index 4ce2402a5fb..a2d4a0ea77e 100644
--- a/ACE/ace/CDR_Stream.h
+++ b/ACE/ace/CDR_Stream.h
@@ -528,9 +528,10 @@ private:
   // that the provide location locates.
   ACE_Message_Block* find (char* loc);
 
-  /// disallow copying...
-  ACE_OutputCDR (const ACE_OutputCDR& rhs);
-  ACE_OutputCDR& operator= (const ACE_OutputCDR& rhs);
+  ACE_OutputCDR (const ACE_OutputCDR&) = delete;
+  ACE_OutputCDR& operator= (const ACE_OutputCDR&) = delete;
+  ACE_OutputCDR (ACE_OutputCDR&&) = delete;
+  ACE_OutputCDR& operator= (ACE_OutputCDR&&) = delete;
 
   ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x);
   ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x);
diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 7ab61cacf49..64612470e80 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -170,9 +170,10 @@ private:
    */
   bool open_i (const ACE_TCHAR *dll_name, int open_mode, ERROR_STACK* errors);
 
-  /// Disallow copying and assignment since we don't handle them.
-  ACE_DLL_Handle (const ACE_DLL_Handle &);
-  void operator= (const ACE_DLL_Handle &);
+  ACE_DLL_Handle (const ACE_DLL_Handle &) = delete;
+  void operator= (const ACE_DLL_Handle &) = delete;
+  ACE_DLL_Handle (ACE_DLL_Handle &&) = delete;
+  void operator= (ACE_DLL_Handle &&) = delete;
 
 private:
   /// Keep track of how many ACE_DLL objects have a reference to this
@@ -288,9 +289,10 @@ private:
   /// Close the singleton instance.
   static void close_singleton (void);
 
-  /// Disallow copying and assignment since we don't handle these.
-  ACE_DLL_Manager (const ACE_DLL_Manager &);
-  void operator= (const ACE_DLL_Manager &);
+  ACE_DLL_Manager (const ACE_DLL_Manager &) = delete;
+  void operator= (const ACE_DLL_Manager &) = delete;
+  ACE_DLL_Manager (ACE_DLL_Manager &&) = delete;
+  void operator= (ACE_DLL_Manager &&) = delete;
 
 private:
   /// Vector containing all loaded handle objects.
diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h
index fbe64a18a3b..e25fb23487c 100644
--- a/ACE/ace/Get_Opt.h
+++ b/ACE/ace/Get_Opt.h
@@ -428,9 +428,10 @@ private:
   /// Set last_option.
   void last_option (const ACE_TString &s);
 
-  // Disallow copying and assignment.
-  ACE_Get_Opt (const ACE_Get_Opt &);
-  ACE_Get_Opt &operator= (const ACE_Get_Opt &);
+  ACE_Get_Opt (const ACE_Get_Opt &) = delete;
+  ACE_Get_Opt &operator= (const ACE_Get_Opt &) = delete;
+  ACE_Get_Opt (ACE_Get_Opt &&) = delete;
+  ACE_Get_Opt &operator= (ACE_Get_Opt &&) = delete;
 
 private:
 
diff --git a/ACE/ace/Log_Record.h b/ACE/ace/Log_Record.h
index 0ace47d7fc9..e68279e5450 100644
--- a/ACE/ace/Log_Record.h
+++ b/ACE/ace/Log_Record.h
@@ -193,9 +193,10 @@ private:
   ///
   ACE_Log_Category_TSS* category_;
 
-  /// disallow copying...
-  ACE_Log_Record (const ACE_Log_Record& rhs);
-  ACE_Log_Record& operator= (const ACE_Log_Record& rhs);
+  ACE_Log_Record (const ACE_Log_Record&) = delete;
+  ACE_Log_Record& operator= (const ACE_Log_Record&) = delete;
+  ACE_Log_Record (ACE_Log_Record&&) = delete;
+  ACE_Log_Record& operator= (ACE_Log_Record&& rhs) = delete;
 };
 
 // Forward decls.
diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h
index 9cf0520033a..62975cfdc64 100644
--- a/ACE/ace/Message_Queue_NT.h
+++ b/ACE/ace/Message_Queue_NT.h
@@ -182,10 +182,10 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
 private:
-
-  // Disallow copying and assignment.
-  ACE_Message_Queue_NT (const ACE_Message_Queue_NT &);
-  void operator= (const ACE_Message_Queue_NT &);
+  ACE_Message_Queue_NT (const ACE_Message_Queue_NT &) = delete;
+  void operator= (const ACE_Message_Queue_NT &) = delete;
+  ACE_Message_Queue_NT (ACE_Message_Queue_NT &&) = delete;
+  void operator= (ACE_Message_Queue_NT &&) = delete;
 
 private:
   // = Internal states.
diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h
index 2ff5a390650..73ccc957720 100644
--- a/ACE/ace/Message_Queue_Vx.h
+++ b/ACE/ace/Message_Queue_Vx.h
@@ -190,10 +190,10 @@ protected:
   MSG_Q_ID msgq (void);
 
 private:
-
-  // Disallow copying and assignment.
-  ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &);
-  void operator= (const ACE_Message_Queue_Vx &);
+  ACE_Message_Queue_Vx (const ACE_Message_Queue_Vx &) = delete;
+  void operator= (const ACE_Message_Queue_Vx &) = delete;
+  ACE_Message_Queue_Vx (ACE_Message_Queue_Vx &&) = delete;
+  void operator= (ACE_Message_Queue_Vx &&) = delete;
 
   virtual int peek_dequeue_head (ACE_Message_Block *&first_item,
                                  ACE_Time_Value *tv = 0);
diff --git a/ACE/ace/Method_Request.h b/ACE/ace/Method_Request.h
index c742dcd92e7..2b59488e9e7 100644
--- a/ACE/ace/Method_Request.h
+++ b/ACE/ace/Method_Request.h
@@ -79,10 +79,10 @@ public:
   virtual int call (void) = 0;
 
 private:
-
-  /// Disallow copying and assignment.
-  ACE_Method_Request (const ACE_Method_Request &);
-  void operator= (const ACE_Method_Request &);
+  ACE_Method_Request (const ACE_Method_Request &) = delete;
+  void operator= (const ACE_Method_Request &) = delete;
+  ACE_Method_Request (ACE_Method_Request &&) = delete;
+  void operator= (ACE_Method_Request &&) = delete;
 
 protected:
   /// The priority of the request.
diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h
index cf2ab6c0e25..ef6269592cd 100644
--- a/ACE/ace/Null_Mutex.h
+++ b/ACE/ace/Null_Mutex.h
@@ -115,11 +115,10 @@ public:
   void dump (void) const {}
 
 private:
-
-  // Disallow copying and assignment.
-  ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &);
-  void operator= (const ACE_Guard<ACE_Null_Mutex> &);
-
+  ACE_Guard (const ACE_Guard<ACE_Null_Mutex> &) = delete;
+  void operator= (const ACE_Guard<ACE_Null_Mutex> &) = delete;
+  ACE_Guard (ACE_Guard<ACE_Null_Mutex> &&) = delete;
+  void operator= (ACE_Guard<ACE_Null_Mutex> &&) = delete;
 };
 
 template <class ACE_LOCK>
diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h
index 33171fae85e..9a7c0b823b4 100644
--- a/ACE/ace/Object_Manager.h
+++ b/ACE/ace/Object_Manager.h
@@ -445,9 +445,10 @@ private:
   friend class ACE_Object_Manager_Manager;
 #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
-  /// Disallow copying by not implementing the following . . .
-  ACE_Object_Manager (const ACE_Object_Manager &);
-  ACE_Object_Manager &operator= (const ACE_Object_Manager &);
+  ACE_Object_Manager (const ACE_Object_Manager &) = delete;
+  ACE_Object_Manager &operator= (const ACE_Object_Manager &) = delete;
+  ACE_Object_Manager (ACE_Object_Manager &&) = delete;
+  ACE_Object_Manager &operator= (ACE_Object_Manager &&) = delete;
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h
index 50c52309ec6..10daa17895d 100644
--- a/ACE/ace/Object_Manager_Base.h
+++ b/ACE/ace/Object_Manager_Base.h
@@ -111,9 +111,10 @@ protected:
   /// Link to next Object_Manager, for chaining.
   ACE_Object_Manager_Base *next_;
 private:
-  // Disallow copying by not implementing the following . . .
-  ACE_Object_Manager_Base (const ACE_Object_Manager_Base &);
-  ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &);
+  ACE_Object_Manager_Base (const ACE_Object_Manager_Base &) = delete;
+  ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &) = delete;
+  ACE_Object_Manager_Base (ACE_Object_Manager_Base &&) = delete;
+  ACE_Object_Manager_Base &operator= (ACE_Object_Manager_Base &&) = delete;
 };
 
 extern "C"
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 1465103ef63..1d20817f7cd 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -642,10 +642,10 @@ public:
 #endif /* ACE_WIN32 */
 
 private:
-
-  // Disallow copying and assignment since we don't support this (yet).
-  ACE_Process (const ACE_Process &);
-  void operator= (const ACE_Process &);
+  ACE_Process (const ACE_Process &) = delete;
+  void operator= (const ACE_Process &) = delete;
+  ACE_Process (ACE_Process &&) = delete;
+  void operator= (ACE_Process &&) = delete;
 
 protected:
   /// Set this process's exit code.  ACE_Process_Manager uses this
diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h
index b22d3f2d85a..0bc07aa5c93 100644
--- a/ACE/ace/Read_Buffer.h
+++ b/ACE/ace/Read_Buffer.h
@@ -89,10 +89,10 @@ public:
   void dump (void) const;
 
 private:
-
-  // Disallow copying and assignment...
-  void operator= (const ACE_Read_Buffer &);
-  ACE_Read_Buffer (const ACE_Read_Buffer &);
+  void operator= (const ACE_Read_Buffer &) = delete;
+  ACE_Read_Buffer (const ACE_Read_Buffer &) = delete;
+  void operator= (ACE_Read_Buffer &&) = delete;
+  ACE_Read_Buffer (ACE_Read_Buffer &&) = delete;
 
 private:
   /// Recursive helper method that does the work...
diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h
index ea43ca118e4..687ef4d382e 100644
--- a/ACE/ace/Select_Reactor.h
+++ b/ACE/ace/Select_Reactor.h
@@ -56,10 +56,10 @@ public:
   void dump (void) const {}
 
 private:
-  // Disallow copying and assignment.
-  ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &);
-  void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &);
-
+  ACE_Guard (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete;
+  void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &) = delete;
+  ACE_Guard (ACE_Guard<ACE_Reactor_Token_T<ACE_Noop_Token> > &&) = delete;
+  void operator= (ACE_Guard<ACE_Reactor_Token_T<ACE_Noop_Token> > &&) = delete;
 };
 // FUZZ: enable check_for_ACE_Guard
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE == 0 */
diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h
index c9be2cf15f5..0a8a326443c 100644
--- a/ACE/ace/TP_Reactor.h
+++ b/ACE/ace/TP_Reactor.h
@@ -66,9 +66,10 @@ public:
 private:
   bool dispatch_;
 
-  // Disallow copying and assignment.
-  ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &);
-  ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &);
+  ACE_EH_Dispatch_Info (const ACE_EH_Dispatch_Info &) = delete;
+  ACE_EH_Dispatch_Info &operator= (const ACE_EH_Dispatch_Info &) = delete;
+  ACE_EH_Dispatch_Info (ACE_EH_Dispatch_Info &&) = delete;
+  ACE_EH_Dispatch_Info &operator= (ACE_EH_Dispatch_Info &&) = delete;
 };
 
 
@@ -114,13 +115,13 @@ public:
   int acquire_token (ACE_Time_Value *max_wait_time = 0);
 
 private:
-
   // Disallow default construction.
   ACE_TP_Token_Guard (void);
 
-  // Disallow copying and assignment.
-  ACE_TP_Token_Guard (const ACE_TP_Token_Guard &);
-  ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &);
+  ACE_TP_Token_Guard (const ACE_TP_Token_Guard &) = delete;
+  ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &) = delete;
+  ACE_TP_Token_Guard (ACE_TP_Token_Guard &&) = delete;
+  ACE_TP_Token_Guard &operator= (ACE_TP_Token_Guard &&) = delete;
 
 private:
 
diff --git a/ACE/ace/XML_Utils/XML_Error_Handler.h b/ACE/ace/XML_Utils/XML_Error_Handler.h
index 6d1b1987742..57d0835f998 100644
--- a/ACE/ace/XML_Utils/XML_Error_Handler.h
+++ b/ACE/ace/XML_Utils/XML_Error_Handler.h
@@ -43,9 +43,10 @@ namespace XML
     void resetErrors();
     bool getErrors (void) const;
   private :
-    // Disallow copying
-    XML_Error_Handler (const XML_Error_Handler&);
-    XML_Error_Handler& operator= (const XML_Error_Handler&);
+    XML_Error_Handler (const XML_Error_Handler&) = delete;
+    XML_Error_Handler& operator= (const XML_Error_Handler&) = delete;
+    XML_Error_Handler (XML_Error_Handler&&) = delete;
+    XML_Error_Handler& operator= (XML_Error_Handler&&) = delete;
 
     bool errors_;
   };