diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 18:35:41 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-08 18:35:41 +0100 |
commit | 08b03d455da1340b9eda18f3b1878e9f9252fc10 (patch) | |
tree | d786f74e4b885658919b06b73f742ea0066f3b75 | |
parent | 813d80ca6f4949f4c831433166c058f4c7bbb975 (diff) | |
download | ATCD-08b03d455da1340b9eda18f3b1878e9f9252fc10.tar.gz |
C++11 modernization
* TAO/tao/Acceptor_Registry.cpp:
* TAO/tao/Acceptor_Registry.h:
* TAO/tao/Block_Flushing_Strategy.h:
* TAO/tao/Blocked_Connect_Strategy.h:
* TAO/tao/Collocated_Invocation.h:
* TAO/tao/Collocation_Resolver.h:
-rw-r--r-- | TAO/tao/Acceptor_Registry.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/Acceptor_Registry.h | 6 | ||||
-rw-r--r-- | TAO/tao/Block_Flushing_Strategy.h | 14 | ||||
-rw-r--r-- | TAO/tao/Blocked_Connect_Strategy.h | 8 | ||||
-rw-r--r-- | TAO/tao/Collocated_Invocation.h | 2 | ||||
-rw-r--r-- | TAO/tao/Collocation_Resolver.h | 2 |
6 files changed, 16 insertions, 22 deletions
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index fb0438ea8cc..20c35ef484f 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -25,12 +25,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Acceptor_Registry::TAO_Acceptor_Registry () - : acceptors_ (nullptr), - size_ (0) -{ -} - TAO_Acceptor_Registry::~TAO_Acceptor_Registry () { this->close_all (); diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 308d9d12141..1c6b5506964 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -60,7 +60,7 @@ class TAO_Export TAO_Acceptor_Registry { public: /// Default constructor. - TAO_Acceptor_Registry (); + TAO_Acceptor_Registry () = default; /// Default destructor. ~TAO_Acceptor_Registry (); @@ -135,10 +135,10 @@ private: private: /// List of acceptors that are currently open. - TAO_Acceptor **acceptors_; + TAO_Acceptor **acceptors_ {}; /// Number of acceptors that are currently open. - size_t size_; + size_t size_ {}; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h index d8a593be810..feca0f059e3 100644 --- a/TAO/tao/Block_Flushing_Strategy.h +++ b/TAO/tao/Block_Flushing_Strategy.h @@ -36,13 +36,13 @@ namespace TAO class TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy { public: - virtual int schedule_output (TAO_Transport *transport); - virtual int cancel_output (TAO_Transport *transport); - virtual int flush_message (TAO_Transport *transport, - TAO_Queued_Message *msg, - ACE_Time_Value *max_wait_time); - virtual int flush_transport (TAO_Transport *transport - , ACE_Time_Value *max_wait_time); + int schedule_output (TAO_Transport *transport) override; + int cancel_output (TAO_Transport *transport) override; + int flush_message (TAO_Transport *transport, + TAO_Queued_Message *msg, + ACE_Time_Value *max_wait_time) override; + int flush_transport (TAO_Transport *transport + , ACE_Time_Value *max_wait_time) override; private: int call_handle_output (TAO_Transport *transport, diff --git a/TAO/tao/Blocked_Connect_Strategy.h b/TAO/tao/Blocked_Connect_Strategy.h index df6e230a09f..404eb2d3be7 100644 --- a/TAO/tao/Blocked_Connect_Strategy.h +++ b/TAO/tao/Blocked_Connect_Strategy.h @@ -36,12 +36,12 @@ public: * Concrete implementation for this class. Please see * Connect_Strategy.h for details */ - virtual void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt); + void synch_options (ACE_Time_Value *val, ACE_Synch_Options &opt) override; protected: - virtual int wait_i (TAO_LF_Event *ev, - TAO_Transport *t, - ACE_Time_Value *val); + int wait_i (TAO_LF_Event *ev, + TAO_Transport *t, + ACE_Time_Value *val) override; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h index 41dfc3b23ac..bec4d7e70b1 100644 --- a/TAO/tao/Collocated_Invocation.h +++ b/TAO/tao/Collocated_Invocation.h @@ -84,7 +84,7 @@ namespace TAO private: // Disallow default construction. - Collocated_Invocation (void); + Collocated_Invocation () = delete; }; } diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h index 9f405446b18..c3360654e0e 100644 --- a/TAO/tao/Collocation_Resolver.h +++ b/TAO/tao/Collocation_Resolver.h @@ -44,7 +44,7 @@ class TAO_Export TAO_Collocation_Resolver { public: /// Destructor. - virtual ~TAO_Collocation_Resolver (void); + virtual ~TAO_Collocation_Resolver (); /// Is @a object collocated? virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object) const = 0; |