Merge branch 'master' into jwi-autoptr

8 files changed, 30 insertions, 28 deletions

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 c8b32f9ca33..6006017b4be 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -95,9 +95,10 @@ protected:
   CORBA::Boolean bootstrapper_;
 
 private:
-  // Disallow copying and assignment.
   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)