Merge pull request #1489 from jwillemsen/jwi-usedelete

Make use of delete to make sure an operation can't be called

21 files changed, 40 insertions, 79 deletions

diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h
index 17075f11837..3bf1e09a5c6 100644
--- a/ACE/ace/TP_Reactor.h
+++ b/ACE/ace/TP_Reactor.h
@@ -115,9 +115,7 @@ public:
   int acquire_token (ACE_Time_Value *max_wait_time = 0);
 
 private:
-  // Disallow default construction.
-  ACE_TP_Token_Guard (void);
-
+  ACE_TP_Token_Guard () = delete;
   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;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 85f7e25cbf1..bc9e3aaaac4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -123,9 +123,8 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "T *ptr_;" << be_nl
       << "PortableServer::POA_var poa_;" << be_nl
       << "::CORBA::Boolean rel_;" << be_nl_2
-      << "// copy and assignment are not allowed" << be_nl
-      << tiename << " (const " << tiename << " &);" << be_nl
-      << "void operator= (const " << tiename << " &);" << be_uidt_nl
+      << tiename << " (const " << tiename << " &) = delete;" << be_nl
+      << "void operator= (const " << tiename << " &) = delete;" << be_uidt_nl
       << "};";
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
index 2aefd8183b7..7f7569743ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
@@ -80,7 +80,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
 
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename << " (T &t)" << be_idt_nl
-      << ": ptr_ (&t)," << be_idt_nl
+      << ": ptr_ (std::addressof(t))," << be_idt_nl
       << "poa_ ( ::PortableServer::POA::_nil ())," << be_nl
       << "rel_ (false)" << be_uidt << be_uidt_nl
       << "{}" << be_nl_2;
@@ -88,7 +88,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
   *os << "template <class T>" << be_nl
       << fulltiename << "<T>::" << localtiename
       << " (T &t, ::PortableServer::POA_ptr poa)" << be_idt_nl
-      << ": ptr_ (&t)," << be_idt_nl
+      << ": ptr_ (std::addressof(t))," << be_idt_nl
       << "poa_ ( ::PortableServer::POA::_duplicate (poa))," << be_nl
       << "rel_ (false)" << be_uidt << be_uidt_nl
       << "{}" << be_nl_2;
@@ -132,7 +132,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node)
       << "{" << be_idt_nl
       << "delete this->ptr_;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "this->ptr_ = &obj;" << be_nl
+      << "this->ptr_ = std::addressof(obj);" << be_nl
       << "this->rel_ = false;" << be_uidt_nl
       << "}" << be_nl_2;
 
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
index bec4d7e70b1..633b1c120d7 100644
--- a/TAO/tao/Collocated_Invocation.h
+++ b/TAO/tao/Collocated_Invocation.h
@@ -83,7 +83,6 @@ namespace TAO
     Invocation_Status invoke (Collocation_Strategy strat);
 
   private:
-    // Disallow default construction.
     Collocated_Invocation () = delete;
   };
 }
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 08864b9686e..8250d118d2b 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -67,9 +67,8 @@ public:
   static CORBA::TypeCode_ptr strip_alias (CORBA::TypeCode_ptr tc);
 
 private:
-  // Not allowed.
-  TAO_DynAnyFactory (const TAO_DynAnyFactory &src);
-  TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src);
+  TAO_DynAnyFactory (const TAO_DynAnyFactory &src) = delete;
+  TAO_DynAnyFactory &operator= (const TAO_DynAnyFactory &src) = delete;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index c94438783e7..d4ac999a9d8 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -10,15 +10,6 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-CORBA::Context::Context ()
-  : refcount_ (1)
-{
-}
-
-CORBA::Context::~Context ()
-{
-}
-
 CORBA::ULong
 CORBA::Context::_incr_refcount ()
 {
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 39230031607..3bbc17f3bef 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -69,9 +69,8 @@ namespace CORBA
   class TAO_DynamicInterface_Export Context
   {
   public:
-    Context (void);
-
-    ~Context (void);
+    Context () = default;
+    ~Context () = default;
 
     // = Pseudo-object methods
     static Context *_duplicate (Context*);
@@ -109,7 +108,7 @@ namespace CORBA
 
   private:
     /// Reference counter.
-    std::atomic<uint32_t> refcount_;
+    std::atomic<uint32_t> refcount_ { 1 };
   };
 
   /**
@@ -123,7 +122,7 @@ namespace CORBA
   {
   public:
     /// Constructor.
-    ContextList (void);
+    ContextList () = default;
 
     /// Constructor - initialize given a length and an array of
     /// strings.
@@ -169,9 +168,8 @@ namespace CORBA
     typedef CORBA::ContextList_out _out_type;
 
   private:
-    // Not allowed.
-    ContextList (const ContextList &);
-    ContextList &operator= (const ContextList &);
+    ContextList (const ContextList &) = delete;
+    ContextList &operator= (const ContextList &) = delete;
 
     /// Reference counter.
     std::atomic<uint32_t> refcount_;
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index adc82cb7a4f..0c6fe49dd3d 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -25,11 +25,6 @@ CORBA::Context::_nil ()
 // *************************************************************
 
 ACE_INLINE
-CORBA::ContextList::ContextList ()
-{
-}
-
-ACE_INLINE
 CORBA::ULong
 CORBA::ContextList::count ()
 {
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
index 66fbb404d28..8c78ee1dfdf 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments.h
@@ -57,7 +57,7 @@ namespace TAO
     CORBA::NamedValue_ptr x_;
 
     /// Byte order that the Request class will use
-    int byte_order_;
+    int byte_order_ {};
   };
 
   /**
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.inl b/TAO/tao/DynamicInterface/DII_Arguments.inl
index 29122b9427d..5f02d5cab99 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.inl
+++ b/TAO/tao/DynamicInterface/DII_Arguments.inl
@@ -6,7 +6,6 @@ namespace TAO
   ACE_INLINE
   NamedValue_Argument::NamedValue_Argument (CORBA::NamedValue_ptr x)
     : x_ (x)
-    , byte_order_ (0)
   {
   }
 
@@ -21,7 +20,7 @@ namespace TAO
   ACE_INLINE
   NVList_Argument::NVList_Argument (CORBA::NVList_ptr x, bool lazy_eval)
     : x_ (x)
-      , lazy_evaluation_ (lazy_eval)
+    , lazy_evaluation_ (lazy_eval)
   {
   }
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index 8c12cd82c57..2c80c8a5d94 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -52,7 +52,7 @@ namespace TAO
                     bool response_expected = true);
 
 #if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (void);
+    virtual Dynamic::ParameterList *arguments ();
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
 
   protected:
@@ -78,7 +78,7 @@ namespace TAO
                              bool response_expected = true);
 
 #if TAO_HAS_INTERCEPTORS ==1
-    virtual Dynamic::ParameterList *arguments (void);
+    virtual Dynamic::ParameterList *arguments ();
 #endif /*TAO_HAS_INTERCEPTORS == 1*/
   };
 }
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
index 43e5e098114..2e529f0318b 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -90,7 +90,7 @@ namespace TAO
                             CORBA::Request *r,
                             Invocation_Mode mode = TAO_DII_INVOCATION);
 
-    virtual ~DII_Invocation_Adapter (void);
+    virtual ~DII_Invocation_Adapter ();
 
     /// Invoke the target
     virtual void invoke (const TAO::Exception_Data *ex, unsigned long ex_count);
@@ -116,11 +116,9 @@ namespace TAO
 
     TAO::Exception_Data *ex_data_;
   private:
-    /// Dont allow default initializations
-    DII_Invocation_Adapter (void);
-
-    DII_Invocation_Adapter (const DII_Invocation_Adapter &);
-    DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &);
+    DII_Invocation_Adapter () = delete;
+    DII_Invocation_Adapter (const DII_Invocation_Adapter &) = delete;
+    DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &) = delete;
   };
 
   /**
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index d36706cacf9..10dd960187b 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -16,11 +16,6 @@ TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (
 {
 }
 
-// Destructor.
-TAO_DII_Deferred_Reply_Dispatcher::~TAO_DII_Deferred_Reply_Dispatcher (void)
-{
-}
-
 // Dispatch the reply.
 int
 TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
index 232e9d76d51..0e259322511 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h
@@ -58,7 +58,7 @@ public:
 
 protected:
   /// Destructor.
-  ~TAO_DII_Deferred_Reply_Dispatcher (void);
+  ~TAO_DII_Deferred_Reply_Dispatcher () = default;
 
 private:
   /// Where the reply needs to go.
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
index 1bfa74fede8..6370e764e28 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.cpp
@@ -23,9 +23,6 @@ TAO_DII_Reply_Handler::_nil ()
 
 // DII Request class implementation
 int TAO_DII_Reply_Handler::_tao_class_id = 0;
-TAO_DII_Reply_Handler::TAO_DII_Reply_Handler ()
-{
-}
 
 TAO_DII_Reply_Handler::~TAO_DII_Reply_Handler ()
 {
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.h b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
index 3c4ec944f7b..4a673b0ee8a 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Handler.h
+++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.h
@@ -37,10 +37,10 @@ typedef TAO_DII_Reply_Handler* TAO_DII_Reply_Handler_ptr;
 class TAO_DynamicInterface_Export TAO_DII_Reply_Handler_var
 {
 public:
-  TAO_DII_Reply_Handler_var (void);
+  TAO_DII_Reply_Handler_var ();
   TAO_DII_Reply_Handler_var (TAO_DII_Reply_Handler_ptr);
   TAO_DII_Reply_Handler_var (const TAO_DII_Reply_Handler_var &);
-  ~TAO_DII_Reply_Handler_var (void);
+  ~TAO_DII_Reply_Handler_var ();
 
   TAO_DII_Reply_Handler_var &operator= (TAO_DII_Reply_Handler_ptr);
   TAO_DII_Reply_Handler_var &operator= (const TAO_DII_Reply_Handler_var &);
@@ -50,9 +50,9 @@ public:
   operator TAO_DII_Reply_Handler_ptr &();
 
   TAO_DII_Reply_Handler_ptr in () const;
-  TAO_DII_Reply_Handler_ptr &inout (void);
-  TAO_DII_Reply_Handler_ptr &out (void);
-  TAO_DII_Reply_Handler_ptr _retn (void);
+  TAO_DII_Reply_Handler_ptr &inout ();
+  TAO_DII_Reply_Handler_ptr &out ();
+  TAO_DII_Reply_Handler_ptr _retn ();
   TAO_DII_Reply_Handler_ptr ptr () const;
 
 private:
@@ -71,8 +71,8 @@ class TAO_DynamicInterface_Export TAO_DII_Reply_Handler
   : public virtual ::CORBA::LocalObject
 {
 public:
-  TAO_DII_Reply_Handler ();
-  virtual ~TAO_DII_Reply_Handler (void);
+  TAO_DII_Reply_Handler () = default;
+  virtual ~TAO_DII_Reply_Handler ();
 
   /// Callback method for asynchronous requests.
   virtual void handle_response (TAO_InputCDR &incoming) = 0;
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 1c73b9e3572..4a91448a9f0 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -39,8 +39,8 @@ class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl
   : public TAO_Dynamic_Adapter
 {
 public:
-  TAO_Dynamic_Adapter_Impl (void);
-  virtual ~TAO_Dynamic_Adapter_Impl (void);
+  TAO_Dynamic_Adapter_Impl ();
+  virtual ~TAO_Dynamic_Adapter_Impl ();
 
   // CORBA::Object::_create_request and CORBA::Object::_request.
 
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 8e38a929adf..b28dcb53b9e 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -53,7 +53,7 @@ namespace CORBA
   {
   public:
     /// Constructor.
-    ExceptionList (void);
+    ExceptionList ();
 
     /// Constructor - initialize given a length and an array of
     /// TypeCodes.
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index 9f2304da7f4..b46e6032395 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -244,12 +244,9 @@ namespace TAO
                              TAO_Operation_Details &details);
 
   private:
-    /// Don't allow default initializations
-    Invocation_Adapter ();
-
-    // Prevent copying
-    Invocation_Adapter (Invocation_Adapter const &);
-    Invocation_Adapter & operator= (const Invocation_Adapter &);
+    Invocation_Adapter () = delete;
+    Invocation_Adapter (Invocation_Adapter const &) = delete;
+    Invocation_Adapter & operator= (const Invocation_Adapter &) = delete;
 
     /**
     * This method returns the right collocation strategy, if any,
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 7175889b3a4..052dcd75da7 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -93,11 +93,9 @@ namespace TAO
                             ARDB_Refcount_Functor> safe_rd_;
 
   private:
-    /// Don't allow default initializations
-    Asynch_Invocation_Adapter ();
-
-    Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &);
-    Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &);
+    Asynch_Invocation_Adapter () = delete;
+    Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &) = delete;
+    Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &) = delete;
 
   };
 } // End namespace TAO
diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
index 4522590249d..e39535721f7 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h
@@ -55,9 +55,7 @@ namespace TAO
         bool has_in_args = false);
 
   private:
-    // Don't allow default initializations
-    AbstractBase_Invocation_Adapter (void);
-
+    AbstractBase_Invocation_Adapter () = delete;
     AbstractBase_Invocation_Adapter (const AbstractBase_Invocation_Adapter &) = delete;
     AbstractBase_Invocation_Adapter & operator= (const AbstractBase_Invocation_Adapter &) = delete;
     AbstractBase_Invocation_Adapter (AbstractBase_Invocation_Adapter &&) = delete;