Merge pull request #1336 from jwillemsen/jwi-deleted

Instead of declaring private copy/assignment list them as deleted and…

38 files changed, 160 insertions, 142 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_;
   };
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
index a64e2292b94..a5714ebb4c1 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -37,9 +37,10 @@ private:
   ACE_Auto_Ptr<ImR_Activator_ORB_Runner> runner_;
 
 private:
-  // Disallow copying and assignment.
-  ImR_Activator_Loader (const ImR_Activator_Loader &);
-  ImR_Activator_Loader &operator = (const ImR_Activator_Loader &);
+  ImR_Activator_Loader (const ImR_Activator_Loader &) = delete;
+  ImR_Activator_Loader &operator = (const ImR_Activator_Loader &) = delete;
+  ImR_Activator_Loader (ImR_Activator_Loader &&) = delete;
+  ImR_Activator_Loader &operator = (ImR_Activator_Loader &&) = delete;
 };
 
 ACE_FACTORY_DECLARE (Activator, ImR_Activator_Loader)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
index 31735821a36..d5b154f929c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -35,9 +35,10 @@ private:
   Options opts_;
   ACE_Auto_Ptr<ImR_Locator_ORB_Runner> runner_;
 private:
-  // Disallow copying and assignment.
-  ImR_Locator_Loader (const ImR_Locator_Loader &);
-  ImR_Locator_Loader &operator = (const ImR_Locator_Loader &);
+  ImR_Locator_Loader (const ImR_Locator_Loader &) = delete;
+  ImR_Locator_Loader &operator = (const ImR_Locator_Loader &) = delete;
+  ImR_Locator_Loader (ImR_Locator_Loader &&) = delete;
+  ImR_Locator_Loader &operator = (ImR_Locator_Loader &&) = delete;
 };
 
 ACE_FACTORY_DECLARE (Locator, ImR_Locator_Loader)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index db4f396520d..51ef58e254e 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -56,11 +56,10 @@ public:
   TAO_Concurrency_Server concurrency_server_;
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Concurrency_Loader (const TAO_Concurrency_Loader &);
-  TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &);
-
+  TAO_Concurrency_Loader (const TAO_Concurrency_Loader &) = delete;
+  TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &) = delete;
+  TAO_Concurrency_Loader (TAO_Concurrency_Loader &&) = delete;
+  TAO_Concurrency_Loader &operator = (TAO_Concurrency_Loader &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 1148ce28edb..13444dc750a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -94,9 +94,10 @@ protected:
   CosNaming::Name channel_name_;
 
 private:
-  // Disallow copying and assignment.
-  TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &);
-  TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &);
+  TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &) = delete;
+  TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &) = delete;
+  TAO_CEC_Event_Loader (TAO_CEC_Event_Loader &&) = delete;
+  TAO_CEC_Event_Loader &operator= (TAO_CEC_Event_Loader &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index db98b1d895f..c9281a4bffd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -110,12 +110,10 @@ protected:
   void un_publish (TAO_Notify_ProxyConsumer* proxy_consumer, const TAO_Notify_EventTypeSeq& seq, TAO_Notify_EventTypeSeq& last_seq);
 
 private:
-  // Disallow copying and assignment; we don't need them
-  // and if we let the compiler generate them it needs the
-  // full declaration of the template arguments for ACE_Auto_Ptr<>
-  // below.
-  TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&);
-  TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&);
+  TAO_Notify_Event_Manager (const TAO_Notify_Event_Manager&) = delete;
+  TAO_Notify_Event_Manager& operator= (const TAO_Notify_Event_Manager&) = delete;
+  TAO_Notify_Event_Manager (TAO_Notify_Event_Manager&&) = delete;
+  TAO_Notify_Event_Manager& operator= (TAO_Notify_Event_Manager&&) = delete;
 
   /// Consumer Map
   ACE_Auto_Ptr< TAO_Notify_Consumer_Map > consumer_map_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 521827604cc..6905df54a60 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -134,9 +134,10 @@ public:
   typedef ACE_Unbounded_Queue<Preference_Info> Ordered_Offers;
 
 private:
-  /// Disallow copying.
-  TAO_Preference_Interpreter (const TAO_Preference_Interpreter&);
-  TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&);
+  TAO_Preference_Interpreter (const TAO_Preference_Interpreter&) = delete;
+  TAO_Preference_Interpreter& operator= (const TAO_Preference_Interpreter&) = delete;
+  TAO_Preference_Interpreter (TAO_Preference_Interpreter&&) = delete;
+  TAO_Preference_Interpreter& operator= (TAO_Preference_Interpreter&&) = delete;
 
   /// The ordered list of offers.
   Ordered_Offers offers_;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index 0351c364934..c4546897636 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -344,12 +344,12 @@ private:
   CORBA::Boolean sequence_does_contain (CORBA::Any* sequence,
                                         TAO_Literal_Constraint& element);
 
-  /// Disallow copying.
-  TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&);
-  TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&);
+  TAO_Constraint_Evaluator (const TAO_Constraint_Evaluator&) = delete;
+  TAO_Constraint_Evaluator& operator= (const TAO_Constraint_Evaluator&) = delete;
+  TAO_Constraint_Evaluator (TAO_Constraint_Evaluator&&) = delete;
+  TAO_Constraint_Evaluator& operator= (TAO_Constraint_Evaluator&&) = delete;
 
 protected:
-
   /// The map of property names to their values for a property.
   TAO_Lookup_Table props_;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 0eae04554d0..533c409d90a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -96,9 +96,10 @@ protected:
   CORBA::Boolean bootstrapper_;
 
 private:
-  // Disallow copying and assignment.
-  TAO_Trading_Loader (const TAO_Trading_Loader &);
-  TAO_Trading_Loader &operator= (const TAO_Trading_Loader &);
+  TAO_Trading_Loader (const TAO_Trading_Loader &) = delete;
+  TAO_Trading_Loader &operator= (const TAO_Trading_Loader &) = delete;
+  TAO_Trading_Loader (TAO_Trading_Loader &&) = delete;
+  TAO_Trading_Loader &operator= (TAO_Trading_Loader &&) = delete;
 };
 
 ACE_FACTORY_DECLARE (TAO_Trading_Serv, TAO_Trading_Loader)
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index f7406c6000d..3efeca9a5ca 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -240,9 +240,10 @@ public:
   int offset (char* pos);
 
 private:
-  // disallow copying...
-  TAO_OutputCDR (const TAO_OutputCDR& rhs);
-  TAO_OutputCDR& operator= (const TAO_OutputCDR& rhs);
+  TAO_OutputCDR (const TAO_OutputCDR&rhs) = delete;
+  TAO_OutputCDR& operator= (const TAO_OutputCDR&) = delete;
+  TAO_OutputCDR (TAO_OutputCDR&&) = delete;
+  TAO_OutputCDR& operator= (TAO_OutputCDR&&) = delete;
 
 private:
   /**
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index f9ff5707a93..6a644e300f8 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -81,9 +81,10 @@ public:
   TAO_ConnectorSetIterator end (void) const;
 
 private:
-  // Disallow copying and assignment.
-  TAO_Connector_Registry (const TAO_Connector_Registry&);
-  void operator= (const TAO_Connector_Registry&);
+  TAO_Connector_Registry (const TAO_Connector_Registry&) = delete;
+  void operator= (const TAO_Connector_Registry&) = delete;
+  TAO_Connector_Registry (TAO_Connector_Registry&&) = delete;
+  void operator= (TAO_Connector_Registry&&) = delete;
 
 private:
   /// List of connectors that are currently open.
diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h
index be6d1f43034..7bb4e8abba6 100644
--- a/TAO/tao/GIOP_Fragmentation_Strategy.h
+++ b/TAO/tao/GIOP_Fragmentation_Strategy.h
@@ -68,9 +68,10 @@ public:
                         ACE_CDR::ULong pending_length) = 0;
 
 private:
-  // Disallow copying and assignment.
-  TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &);
-  void operator= (TAO_GIOP_Fragmentation_Strategy const &);
+  TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy const &) = delete;
+  void operator= (TAO_GIOP_Fragmentation_Strategy const &) = delete;
+  TAO_GIOP_Fragmentation_Strategy (TAO_GIOP_Fragmentation_Strategy&&) = delete;
+  void operator= (TAO_GIOP_Fragmentation_Strategy &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h
index 11f2a09c8f0..2967593191a 100644
--- a/TAO/tao/MMAP_Allocator.h
+++ b/TAO/tao/MMAP_Allocator.h
@@ -58,9 +58,10 @@ public:
   off_t offset (void * p);
 
 private:
-  // Disallow copying.
-  TAO_MMAP_Allocator (TAO_MMAP_Allocator const &);
-  void operator= (TAO_MMAP_Allocator const &);
+  TAO_MMAP_Allocator (TAO_MMAP_Allocator const &) = delete;
+  void operator= (TAO_MMAP_Allocator const &) = delete;
+  TAO_MMAP_Allocator (TAO_MMAP_Allocator &&) = delete;
+  void operator= (TAO_MMAP_Allocator &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Nested_Upcall_Guard.h b/TAO/tao/Nested_Upcall_Guard.h
index 60c95f9e8ca..3673bae0fde 100644
--- a/TAO/tao/Nested_Upcall_Guard.h
+++ b/TAO/tao/Nested_Upcall_Guard.h
@@ -84,9 +84,10 @@ namespace TAO
   private:
     Nested_Upcall_Guard (void);
 
-    /// Disallow copying and assignment.
-    Nested_Upcall_Guard (const Nested_Upcall_Guard&);
-    Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&);
+    Nested_Upcall_Guard (const Nested_Upcall_Guard&) = delete;
+    Nested_Upcall_Guard &operator= (const Nested_Upcall_Guard&) = delete;
+    Nested_Upcall_Guard (Nested_Upcall_Guard&&) = delete;
+    Nested_Upcall_Guard &operator= (Nested_Upcall_Guard&&) = delete;
 
   private:
     /// Pointer to the transport that we plan to use.
diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h
index a24b532a95d..6efc37b0450 100644
--- a/TAO/tao/Null_Fragmentation_Strategy.h
+++ b/TAO/tao/Null_Fragmentation_Strategy.h
@@ -45,9 +45,10 @@ public:
   virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong);
 
 private:
-  // Disallow copying and assignment.
-  TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &);
-  void operator= (TAO_Null_Fragmentation_Strategy const &);
+  TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy const &) = delete;
+  void operator= (TAO_Null_Fragmentation_Strategy const &) = delete;
+  TAO_Null_Fragmentation_Strategy (TAO_Null_Fragmentation_Strategy &&) = delete;
+  void operator= (TAO_Null_Fragmentation_Strategy &&) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 24b90a68ece..4b54007f178 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -102,9 +102,10 @@ private:
   //@}
 
 private:
-  // Disallow copying and assignment.
-  TAO_Object_Ref_Table (const TAO_Object_Ref_Table &);
-  void operator= (const TAO_Object_Ref_Table &);
+  TAO_Object_Ref_Table (const TAO_Object_Ref_Table &) = delete;
+  void operator= (const TAO_Object_Ref_Table &) = delete;
+  TAO_Object_Ref_Table (TAO_Object_Ref_Table &&) = delete;
+  void operator= (TAO_Object_Ref_Table &&) = delete;
 
 private:
   /// The implementation.
diff --git a/TAO/tao/On_Demand_Fragmentation_Strategy.h b/TAO/tao/On_Demand_Fragmentation_Strategy.h
index ef893a8849a..a695f89f735 100644
--- a/TAO/tao/On_Demand_Fragmentation_Strategy.h
+++ b/TAO/tao/On_Demand_Fragmentation_Strategy.h
@@ -52,9 +52,10 @@ public:
                         ACE_CDR::ULong pending_length);
 
 private:
-  // Disallow copying and assignment.
-  TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &);
-  void operator= (TAO_On_Demand_Fragmentation_Strategy const &);
+  TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy const &) = delete;
+  void operator= (TAO_On_Demand_Fragmentation_Strategy const &) = delete;
+  TAO_On_Demand_Fragmentation_Strategy (TAO_On_Demand_Fragmentation_Strategy &&) = delete;
+  void operator= (TAO_On_Demand_Fragmentation_Strategy &&) = delete;
 
 private:
   /// Pointer to the underlying transport object.
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 619fb506e3f..97a2fea0484 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -54,9 +54,10 @@ public:
                                      CORBA::SetOverrideType set_add);
 
 private:
-  // Disallow copying.
-  TAO_Policy_Manager (TAO_Policy_Manager const &);
-  TAO_Policy_Manager & operator= (TAO_Policy_Manager const &);
+  TAO_Policy_Manager (TAO_Policy_Manager const &) = delete;
+  TAO_Policy_Manager & operator= (TAO_Policy_Manager const &) = delete;
+  TAO_Policy_Manager (TAO_Policy_Manager &&) = delete;
+  TAO_Policy_Manager & operator= (TAO_Policy_Manager &&) = delete;
 
 private:
   /// Protect access
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 40c96ebbdd8..3f0b1812327 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -71,10 +71,10 @@ public:
   void factory (TAO_Protocol_Factory *factory, int owner = 0);
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Protocol_Item (const TAO_Protocol_Item&);
-  void operator= (const TAO_Protocol_Item&);
+  TAO_Protocol_Item (const TAO_Protocol_Item&) = delete;
+  void operator= (const TAO_Protocol_Item&) = delete;
+  TAO_Protocol_Item (TAO_Protocol_Item&&) = delete;
+  void operator= (TAO_Protocol_Item&&) = delete;
 
 private:
   /// Protocol factory name.
diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h
index 54a4460b858..5f1cc3274fc 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -125,12 +125,10 @@ protected:
   //@}
 
 private:
-
-  /// Disallow copying by not implementing the following ...
-  //@{
-  TAO_Singleton_Manager (const TAO_Singleton_Manager &);
-  TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &);
-  //@}
+  TAO_Singleton_Manager (const TAO_Singleton_Manager &) = delete;
+  TAO_Singleton_Manager &operator= (const TAO_Singleton_Manager &) = delete;
+  TAO_Singleton_Manager (TAO_Singleton_Manager &&) = delete;
+  TAO_Singleton_Manager &operator= (TAO_Singleton_Manager &&) = delete;
 
   /// Register an object or array for deletion at program termination.
   /// See description of static version above for return values.
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
index 1b348223320..4522590249d 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
@@ -58,11 +58,10 @@ namespace TAO
     // Don't allow default initializations
     AbstractBase_Invocation_Adapter (void);
 
-    // Disallow copying and assignment.
-    AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &);
-    AbstractBase_Invocation_Adapter & operator= (
-        const AbstractBase_Invocation_Adapter &);
-
+    AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &) = delete;
+    AbstractBase_Invocation_Adapter & operator= (const AbstractBase_Invocation_Adapter &) = delete;
+    AbstractBase_Invocation_Adapter (AbstractBase_Invocation_Adapter &&) = delete;
+    AbstractBase_Invocation_Adapter & operator= (AbstractBase_Invocation_Adapter &&) = delete;
   };
 } // End namespace TAO