diff options
Diffstat (limited to 'ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp')
| -rw-r--r-- | ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index 083dda5e5ff..943304eaf49 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp @@ -40,13 +40,13 @@ public: protected: - virtual ~Bogus_Handler (void); + ~Bogus_Handler () override; - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - virtual int resume_handler (void); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; + int resume_handler () override; private: @@ -69,12 +69,12 @@ Bogus_Handler::Bogus_Handler (ACE_Reactor * reactor, ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } -Bogus_Handler::~Bogus_Handler (void) +Bogus_Handler::~Bogus_Handler () { } ACE_HANDLE -Bogus_Handler::get_handle (void) const +Bogus_Handler::get_handle () const { return this->read_handle_; } @@ -106,7 +106,7 @@ Bogus_Handler::handle_close (ACE_HANDLE, } int -Bogus_Handler::resume_handler (void) +Bogus_Handler::resume_handler () { // We don't want the reactor to resume this event handler. return ACE_APPLICATION_RESUMES_HANDLER; @@ -123,20 +123,20 @@ public: bool & okay_to_close, bool suspension_test); - ACE_HANDLE write_handle (void) const; + ACE_HANDLE write_handle () const; protected: - virtual ~Bad_Handler (void); + ~Bad_Handler () override; private: - virtual ACE_HANDLE get_handle (void) const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; - int handle_input_result (void) const; + int handle_input_result () const; private: @@ -168,12 +168,12 @@ Bad_Handler::Bad_Handler (ACE_Reactor * reactor, } -Bad_Handler::~Bad_Handler (void) +Bad_Handler::~Bad_Handler () { } ACE_HANDLE -Bad_Handler::get_handle (void) const +Bad_Handler::get_handle () const { return this->read_handle_; } @@ -247,7 +247,7 @@ Bad_Handler::handle_close (ACE_HANDLE, } int -Bad_Handler::handle_input_result (void) const +Bad_Handler::handle_input_result () const { return (this->suspension_test_ @@ -366,15 +366,15 @@ handle_events (ACE_Reactor & reactor, // ------------------------------------------------------------ -typedef auto_ptr<ACE_Reactor_Impl> (*reactor_factory_type) (void); +using reactor_factory_type = std::unique_ptr<ACE_Reactor_Impl> (*)(); -auto_ptr<ACE_Reactor_Impl> -dev_poll_reactor_factory (void) +std::unique_ptr<ACE_Reactor_Impl> +dev_poll_reactor_factory () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("Creating ACE_Dev_Poll_Reactor.\n"))); - return auto_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor); + return std::unique_ptr<ACE_Reactor_Impl> (new ACE_Dev_Poll_Reactor); } // ------------------------------------------------------------ @@ -416,7 +416,7 @@ struct Run_Test : public std::unary_function<reactor_factory_type, void> ACE_TEXT ("** Running removal test **\n"))); } - auto_ptr<ACE_Reactor_Impl> the_factory (factory ()); + std::unique_ptr<ACE_Reactor_Impl> the_factory (factory ()); ACE_Reactor reactor (the_factory.get ()); // In this test, it's only okay to close the Bogus_Handler |