diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-04-29 12:34:31 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-04-29 12:34:31 +0200 |
commit | 6f3e147d990d4252f251dde60e5730e1c3009dfe (patch) | |
tree | 02a8d26414950b41af327e3424c9a523727e46b5 | |
parent | e12779d807b00fdc1b69a224dd92ff58d5e20906 (diff) | |
download | ATCD-6f3e147d990d4252f251dde60e5730e1c3009dfe.tar.gz |
Make use of delete to make sure an operation can't be called
* ACE/ace/TP_Reactor.h:
* TAO/tao/Collocated_Invocation.h:
* TAO/tao/DynamicInterface/DII_Arguments.h:
* TAO/tao/DynamicInterface/DII_Arguments.inl:
* TAO/tao/DynamicInterface/DII_Invocation.h:
* TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
* TAO/tao/DynamicInterface/DII_Reply_Handler.cpp:
* TAO/tao/DynamicInterface/DII_Reply_Handler.h:
* TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h:
* TAO/tao/DynamicInterface/ExceptionList.h:
* TAO/tao/Messaging/Asynch_Invocation_Adapter.h:
* TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h:
-rw-r--r-- | ACE/ace/TP_Reactor.h | 4 | ||||
-rw-r--r-- | TAO/tao/Collocated_Invocation.h | 1 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_Arguments.h | 2 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_Arguments.inl | 3 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_Invocation.h | 4 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_Invocation_Adapter.h | 10 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_Reply_Handler.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_Reply_Handler.h | 14 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h | 4 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/ExceptionList.h | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/Asynch_Invocation_Adapter.h | 8 | ||||
-rw-r--r-- | TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h | 4 |
12 files changed, 23 insertions, 36 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/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/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_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/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; |