diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 15:59:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-08 15:59:50 +0100 |
| commit | e05eb413c59f589e7d4192af7e12eb777017bd70 (patch) | |
| tree | e0e30afc85e8167332dcf90eae01db949fe1ed6a | |
| parent | a30b3586e9fbf13b7151e387a37eb59cf0571263 (diff) | |
| parent | 850b8c2db82b57e489ea352536a3c79898a1c655 (diff) | |
| download | ATCD-e05eb413c59f589e7d4192af7e12eb777017bd70.tar.gz | |
Merge pull request #1338 from jwillemsen/jwi-acetestsoverride
Make use of override where it should be used instead of virtual
78 files changed, 380 insertions, 380 deletions
diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp index 3052e966ef5..d48ef7aa9ff 100644 --- a/ACE/tests/Atomic_Op_Test.cpp +++ b/ACE/tests/Atomic_Op_Test.cpp @@ -38,7 +38,7 @@ public: private: Exchange_Tester () {} - int svc (); + int svc () override; ACE_Barrier barrier_; ACE_Atomic_Op<ACE_SYNCH_MUTEX, T> op_; diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp index cc94b2b64f8..a3eb060ebe5 100644 --- a/ACE/tests/Bound_Ptr_Test.cpp +++ b/ACE/tests/Bound_Ptr_Test.cpp @@ -59,14 +59,14 @@ struct Parent struct Child : public Child_Base { Child (ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent); - virtual ~Child (); + ~Child () override; // Back pointer to the parent. The child does not own the parent so has no // effect on its lifetime. ACE_Weak_Bound_Ptr<Parent, ACE_Null_Mutex> parent_; // Perform some operation. Delegates the work to the parent. - virtual void do_something (); + void do_something () override; static size_t instance_count_; }; @@ -178,10 +178,10 @@ class Method_Request_print : public ACE_Method_Request { public: explicit Method_Request_print (Printer_var &printer); - virtual ~Method_Request_print (); + ~Method_Request_print () override; /// This is the entry point into the Active Object method. - virtual int call (); + int call () override; private: Printer_var printer_; @@ -221,8 +221,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (); - virtual int call (); + ~Method_Request_end () override; + int call () override; private: Scheduler *scheduler_; diff --git a/ACE/tests/Buffer_Stream_Test.cpp b/ACE/tests/Buffer_Stream_Test.cpp index d2181159ca0..f8207bde15c 100644 --- a/ACE/tests/Buffer_Stream_Test.cpp +++ b/ACE/tests/Buffer_Stream_Test.cpp @@ -45,8 +45,8 @@ public: //FUZZ: disable check_for_lack_ACE_OS // = ACE_Task hooks. ///FUZZ: enable check_for_lack_ACE_OS - virtual int open (void * = 0); - virtual int close (u_long = 0); + int open (void * = 0) override; + int close (u_long = 0) override; }; /** @@ -60,7 +60,7 @@ public: Supplier () {} /// Read data from stdin and pass to consumer. - virtual int svc (); + int svc () override; }; /** @@ -75,10 +75,10 @@ public: /// Enqueue the message on the ACE_Message_Queue for subsequent /// handling in the svc() method. - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); + int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0) override; /// Receive message from Supplier and print to stdout. - virtual int svc (); + int svc () override; private: /// Amount of time to wait for a timeout. diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp index 09cacb47b1f..7445b5b819c 100644 --- a/ACE/tests/Bug_1890_Regression_Test.cpp +++ b/ACE/tests/Bug_1890_Regression_Test.cpp @@ -44,8 +44,8 @@ public: void send_dummy_data(); /// Reactor callback - virtual ACE_HANDLE get_handle() const; - virtual int handle_input(ACE_HANDLE); + ACE_HANDLE get_handle() const override; + int handle_input(ACE_HANDLE) override; private: size_t handle_input_count_; @@ -74,7 +74,7 @@ public: bool check_expected_results() const; - virtual int handle_timeout(ACE_Time_Value const &, void const*); + int handle_timeout(ACE_Time_Value const &, void const*) override; private: void send_data_through_handlers(); diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp index 80479988006..0dbacfb4d07 100644 --- a/ACE/tests/Bug_2368_Regression_Test.cpp +++ b/ACE/tests/Bug_2368_Regression_Test.cpp @@ -19,8 +19,8 @@ static bool handleB_close_called = false; class My_HandlerA : public ACE_Event_Handler { public: - virtual int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, + ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -29,9 +29,9 @@ public: return 0; } - virtual int handle_signal (int, + int handle_signal (int, siginfo_t *, - ucontext_t *) + ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); @@ -43,8 +43,8 @@ public: class My_HandlerB : public ACE_Event_Handler { public: - virtual int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, + ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -53,9 +53,9 @@ public: return 0; } - virtual int handle_signal (int, + int handle_signal (int, siginfo_t *, - ucontext_t *) + ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); diff --git a/ACE/tests/Bug_2497_Regression_Test.cpp b/ACE/tests/Bug_2497_Regression_Test.cpp index d2586c39de2..b4f0e7a024e 100644 --- a/ACE/tests/Bug_2497_Regression_Test.cpp +++ b/ACE/tests/Bug_2497_Regression_Test.cpp @@ -20,7 +20,7 @@ public: { } - virtual ~Test_Task( ) + ~Test_Task( ) override { ++_destructorCalled; if (_destructorCalled > 1) diff --git a/ACE/tests/Bug_2540_Regression_Test.cpp b/ACE/tests/Bug_2540_Regression_Test.cpp index fc944ec04da..6d624def926 100644 --- a/ACE/tests/Bug_2540_Regression_Test.cpp +++ b/ACE/tests/Bug_2540_Regression_Test.cpp @@ -47,8 +47,8 @@ public: void simulate_socket_closure(); /// Reactor callback - virtual ACE_HANDLE get_handle() const; - virtual int handle_input(ACE_HANDLE); + ACE_HANDLE get_handle() const override; + int handle_input(ACE_HANDLE) override; private: bool auto_remove_flag_; @@ -78,7 +78,7 @@ public: bool check_expected_results() const; - virtual int handle_timeout(ACE_Time_Value const &, void const*); + int handle_timeout(ACE_Time_Value const &, void const*) override; private: void send_data_through_handlers(); diff --git a/ACE/tests/Bug_2609_Regression_Test.cpp b/ACE/tests/Bug_2609_Regression_Test.cpp index a13de9874fb..940a7bc11f7 100644 --- a/ACE/tests/Bug_2609_Regression_Test.cpp +++ b/ACE/tests/Bug_2609_Regression_Test.cpp @@ -38,14 +38,14 @@ public: Reference_Counting_Policy::ENABLED); } - ~My_Svc_Handler() + ~My_Svc_Handler() override { TEST_TRACE ("My_Svc_Handler::~My_Svc_Handler"); g_handler_deleted = true; } //FUZZ: disable check_for_lack_ACE_OS - int open (void* pv) + int open (void* pv) override { TEST_TRACE ("open"); g_semaphore.release (); // signal open completed @@ -56,7 +56,7 @@ public: } //FUZZ: enable check_for_lack_ACE_OS - int handle_close (ACE_HANDLE, ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { TEST_TRACE ("handle_close"); if (g_handler_deleted) @@ -72,7 +72,7 @@ public: struct My_Task : public ACE_Task_Base { - int svc() + int svc() override { TEST_TRACE ("My_Task::svc"); ACE_Reactor *r = ACE_Reactor::instance (); @@ -91,7 +91,7 @@ struct My_Task : public ACE_Task_Base // event handler used to signal when the reactor started struct Timer_Handler : public ACE_Event_Handler { - int handle_timeout (const ACE_Time_Value&, const void*) + int handle_timeout (const ACE_Time_Value&, const void*) override { g_semaphore.release (); // signal reactor started return 0; diff --git a/ACE/tests/Bug_2610_Regression_Test.cpp b/ACE/tests/Bug_2610_Regression_Test.cpp index a3ddee974a3..425f001e8c6 100644 --- a/ACE/tests/Bug_2610_Regression_Test.cpp +++ b/ACE/tests/Bug_2610_Regression_Test.cpp @@ -39,13 +39,13 @@ public: Reference_Counting_Policy::ENABLED); } - ~My_Svc_Handler() + ~My_Svc_Handler() override { TEST_TRACE ("My_Svc_Handler::~My_Svc_Handler"); --g_svc_handlers_leaked; } - int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/) + int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/) override { TEST_TRACE ("handle_close"); g_semaphore.release(); @@ -62,7 +62,7 @@ public: My_Acceptor () : super (ACE_INET_Addr(9000)) {} protected: - int accept_svc_handler (My_Svc_Handler *svc_handler) + int accept_svc_handler (My_Svc_Handler *svc_handler) override { TEST_TRACE ("accept_svc_handler"); int rv = super::accept_svc_handler(svc_handler); @@ -73,7 +73,7 @@ protected: } return rv; } - int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) + int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) override { TEST_TRACE ("My_Acceptor::activate_svc_handler"); g_semaphore.release(); @@ -86,7 +86,7 @@ class My_Connector : public ACE_Connector<My_Svc_Handler, ACE_SOCK_CONNECTOR> public: typedef ACE_Connector<My_Svc_Handler, ACE_SOCK_CONNECTOR> super; protected: - int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) + int activate_svc_handler (My_Svc_Handler* /*svc_handler*/) override { TEST_TRACE ("My_Connector::activate_svc_handler"); g_semaphore.release(); @@ -96,7 +96,7 @@ protected: struct My_Task : public ACE_Task_Base { - int svc() + int svc() override { TEST_TRACE ("My_Task::svc"); ACE_Reactor::instance()->owner(ACE_OS::thr_self()); @@ -114,7 +114,7 @@ struct My_Task : public ACE_Task_Base // event handler used to signal when the reactor started struct Timer_Handler : public ACE_Event_Handler { - int handle_timeout (const ACE_Time_Value&, const void*) + int handle_timeout (const ACE_Time_Value&, const void*) override { g_semaphore.release(); // signal reactor started return 0; diff --git a/ACE/tests/Bug_2653_Regression_Test.cpp b/ACE/tests/Bug_2653_Regression_Test.cpp index e3922ed9fc3..bd33cc00d3e 100644 --- a/ACE/tests/Bug_2653_Regression_Test.cpp +++ b/ACE/tests/Bug_2653_Regression_Test.cpp @@ -31,7 +31,7 @@ static const char *message = class Watchdog : public ACE_Task_Base { public: - int svc (); + int svc () override; int my_grp_; }; @@ -52,11 +52,11 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor, bool close_other); - ~Handler(); + ~Handler() override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; ACE_Pipe pipe_; ACE_Pipe other_pipe_; diff --git a/ACE/tests/Bug_2659_Regression_Test.cpp b/ACE/tests/Bug_2659_Regression_Test.cpp index 0619240c0e7..f393e7626dd 100644 --- a/ACE/tests/Bug_2659_Regression_Test.cpp +++ b/ACE/tests/Bug_2659_Regression_Test.cpp @@ -80,12 +80,12 @@ class ReactorTask : public ACE_Task_Base { public: - virtual ~ReactorTask () + ~ReactorTask () override { EE_DEBUG ("ReactorTask", "~ReactorTask", this); }; - virtual int svc ( ) + int svc ( ) override { EE_DEBUG ("ReactorTask", "svc", this); diff --git a/ACE/tests/Bug_2740_Regression_Test.cpp b/ACE/tests/Bug_2740_Regression_Test.cpp index fde25e15bf9..5c3f7fe54c0 100644 --- a/ACE/tests/Bug_2740_Regression_Test.cpp +++ b/ACE/tests/Bug_2740_Regression_Test.cpp @@ -41,13 +41,13 @@ public: // Each client will send/recv 'echo_cnt' times, close/reopen the socket, // then echo, etc. for ACE_MAX_ITERATIONS times. ClientSvcHandler (const ACE_INET_Addr &addr, int echo_cnt); - ~ClientSvcHandler (); + ~ClientSvcHandler () override; - int open (void* factory); - int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE); - int handle_timeout (const ACE_Time_Value &now, const void *act = 0); + int open (void* factory) override; + int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE) override; + int handle_timeout (const ACE_Time_Value &now, const void *act = 0) override; int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE, - ACE_Reactor_Mask mask = 0); + ACE_Reactor_Mask mask = 0) override; protected: static const char *send_str; @@ -68,10 +68,10 @@ const char *ClientSvcHandler::send_str = class ServerSvcHandler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> { public: - int open (void* factory); - int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE); + int open (void* factory) override; + int handle_input (ACE_HANDLE handle = ACE_INVALID_HANDLE) override; int handle_close (ACE_HANDLE handle = ACE_INVALID_HANDLE, - ACE_Reactor_Mask mask = 0); + ACE_Reactor_Mask mask = 0) override; }; diff --git a/ACE/tests/Bug_2815_Regression_Test.cpp b/ACE/tests/Bug_2815_Regression_Test.cpp index ae70e44bdf1..23baade0054 100644 --- a/ACE/tests/Bug_2815_Regression_Test.cpp +++ b/ACE/tests/Bug_2815_Regression_Test.cpp @@ -176,7 +176,7 @@ public: /// Receive the notifications, but remove itself from the reactor on /// on the first one. - virtual int handle_exception(ACE_HANDLE); + int handle_exception(ACE_HANDLE) override; private: /// The driver for this test, communicate results to it diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp index 945b0b2a25e..9e61081c0e3 100644 --- a/ACE/tests/Bug_2820_Regression_Test.cpp +++ b/ACE/tests/Bug_2820_Regression_Test.cpp @@ -30,10 +30,10 @@ public: Simple_Handler(ACE_Reactor * reactor); /// Destructor - ~Simple_Handler(); + ~Simple_Handler() override; /// Receive (and ignore) the notifications - virtual int handle_exception(ACE_HANDLE); + int handle_exception(ACE_HANDLE) override; }; int diff --git a/ACE/tests/Bug_3878_Regression_Test.cpp b/ACE/tests/Bug_3878_Regression_Test.cpp index 61db0dc3556..4fe3c47e10c 100644 --- a/ACE/tests/Bug_3878_Regression_Test.cpp +++ b/ACE/tests/Bug_3878_Regression_Test.cpp @@ -30,7 +30,7 @@ class Worker : public ACE_Task<ACE_MT_SYNCH> public: Worker (IManager *manager) : manager_(manager) { } - virtual int svc () + int svc () override { ACE_Thread_ID id; thread_id_ = id; @@ -94,7 +94,7 @@ public: ACE_TRACE ("Manager::Manager"); } - int svc () + int svc () override { ACE_TRACE ("Manager::svc"); @@ -139,7 +139,7 @@ public: const ACE_Thread_ID& thread_id (Worker *worker); - virtual int return_to_work (Worker *worker) + int return_to_work (Worker *worker) override { ACE_GUARD_RETURN (ACE_Mutex, worker_mon, this->workers_lock_, -1); diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp index 4624a585df1..d24c079efc0 100644 --- a/ACE/tests/Bug_3912_Regression_Test.cpp +++ b/ACE/tests/Bug_3912_Regression_Test.cpp @@ -37,7 +37,7 @@ public: { } - virtual int close(u_long ); + int close(u_long ) override; private: bool* close_called_; diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp index 2ac33a561f0..8c4d11f60dd 100644 --- a/ACE/tests/Bug_3943_Regression_Test.cpp +++ b/ACE/tests/Bug_3943_Regression_Test.cpp @@ -220,7 +220,7 @@ namespace { Svc_Handler (ACE_Thread_Manager * = 0); // Do-nothing constructor. - virtual int open (void *); + int open (void *) override; // Initialization hook. void send_data (); @@ -229,7 +229,7 @@ namespace { void recv_data (); // Recv data from client. - int close (u_long = 0); + int close (u_long = 0) override; // Shutdown the <Svc_Handler>. private: diff --git a/ACE/tests/Bug_4055_Regression_Test.cpp b/ACE/tests/Bug_4055_Regression_Test.cpp index 7e6a6a273e5..6b09bea8b76 100644 --- a/ACE/tests/Bug_4055_Regression_Test.cpp +++ b/ACE/tests/Bug_4055_Regression_Test.cpp @@ -50,9 +50,9 @@ class MyTask : public ACE_Task<ACE_MT_SYNCH> public: MyTask () : my_reactor_ (0), my_tq_ (0) {} - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (); + int svc () override; int start (int num_threads); int stop (); @@ -177,8 +177,8 @@ public: timeout_triggered_ (false) {} - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + int handle_timeout (const ACE_Time_Value &tv, + const void *arg) override; bool trigger_in(const ACE_Time_Value &delay); diff --git a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp index daef97ae299..d92794937f9 100644 --- a/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Echo_Test.cpp @@ -41,18 +41,18 @@ public: Client (); //FUZZ: disable check_for_lack_ACE_OS - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS - virtual int handle_output (ACE_HANDLE handle); + int handle_output (ACE_HANDLE handle) override; - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; std::string sent; std::string received; @@ -68,12 +68,12 @@ public: Server (); - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; - virtual int handle_output (ACE_HANDLE handle); + int handle_output (ACE_HANDLE handle) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; private: int send_i (const char* buffer, @@ -370,7 +370,7 @@ class TestAcceptor : public ACCEPTOR { public: - virtual int accept_svc_handler (Server * handler) + int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -400,14 +400,14 @@ class TestConnector : public CONNECTOR { public: - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, ACE_Time_Value *timeout, const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) + int perms) override { const int result = this->CONNECTOR::connect_svc_handler (handler, remote_addr, @@ -438,7 +438,7 @@ public: return result; } - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, CONNECTOR::handler_type *& sh_copy, const CONNECTOR::addr_type &remote_addr, @@ -446,7 +446,7 @@ public: const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) { + int perms) override { sh_copy = handler; return this->connect_svc_handler (handler, remote_addr, timeout, local_addr, reuse_addr, flags, diff --git a/ACE/tests/Dev_Poll_Reactor_Test.cpp b/ACE/tests/Dev_Poll_Reactor_Test.cpp index 41b19063df8..4b2be8b2610 100644 --- a/ACE/tests/Dev_Poll_Reactor_Test.cpp +++ b/ACE/tests/Dev_Poll_Reactor_Test.cpp @@ -47,16 +47,16 @@ public: Client (); //FUZZ: disable check_for_lack_ACE_OS - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS - virtual int handle_output (ACE_HANDLE handle); + int handle_output (ACE_HANDLE handle) override; - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; private: @@ -71,13 +71,13 @@ public: Server (); - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; - virtual int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + int handle_timeout (const ACE_Time_Value ¤t_time, + const void *act) override; - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask mask) override; private: @@ -319,7 +319,7 @@ class TestAcceptor : public ACCEPTOR { public: - virtual int accept_svc_handler (Server * handler) + int accept_svc_handler (Server * handler) override { int result = this->ACCEPTOR::accept_svc_handler (handler); @@ -369,14 +369,14 @@ class TestConnector : public CONNECTOR { public: - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, const CONNECTOR::addr_type &remote_addr, ACE_Time_Value *timeout, const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) + int perms) override { const int result = this->CONNECTOR::connect_svc_handler (handler, remote_addr, @@ -423,7 +423,7 @@ public: return result; } - virtual int connect_svc_handler ( + int connect_svc_handler ( CONNECTOR::handler_type *& handler, CONNECTOR::handler_type *& sh_copy, const CONNECTOR::addr_type &remote_addr, @@ -431,7 +431,7 @@ public: const CONNECTOR::addr_type &local_addr, int reuse_addr, int flags, - int perms) { + int perms) override { sh_copy = handler; return this->connect_svc_handler (handler, remote_addr, timeout, local_addr, reuse_addr, flags, diff --git a/ACE/tests/Framework_Component_DLL.cpp b/ACE/tests/Framework_Component_DLL.cpp index ce70f65e65f..d8252f321e9 100644 --- a/ACE/tests/Framework_Component_DLL.cpp +++ b/ACE/tests/Framework_Component_DLL.cpp @@ -42,7 +42,7 @@ template <int which> class Server_T : public ACE_Service_Object { public: - int init (int, ACE_TCHAR *[]) + int init (int, ACE_TCHAR *[]) override { FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::init"); @@ -55,7 +55,7 @@ public: return 0; } - int fini () + int fini () override { FRAMEWORK_COMPONENT_DLL_TRACE ("Server_T::fini"); return 0; diff --git a/ACE/tests/Future_Set_Test.cpp b/ACE/tests/Future_Set_Test.cpp index a162a9b569f..e80274cfe39 100644 --- a/ACE/tests/Future_Set_Test.cpp +++ b/ACE/tests/Future_Set_Test.cpp @@ -59,14 +59,14 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Initializer. - virtual int open (void *args = 0); + int open (void *args = 0) override; /// Terminator. //FUZZ: enable check_for_lack_ACE_OS virtual int shutdown (); /// Destructor. - virtual ~Prime_Scheduler (); + ~Prime_Scheduler () override; // = These methods are part of the Active Object Proxy interface. ACE_Future<u_long> work (u_long param, int count = 1); @@ -76,7 +76,7 @@ public: protected: /// Runs the Prime_Scheduler's event loop, which dequeues /// <Method_Requests> and dispatches them. - virtual int svc (); + int svc () override; // = These are the Servant methods that do the actual work. u_long work_i (u_long, int); @@ -101,10 +101,10 @@ public: u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (); + ~Method_Request_work () override; /// This is the entry point into the Active Object method. - virtual int call (); + int call () override; private: Prime_Scheduler *scheduler_; @@ -159,10 +159,10 @@ class Method_Request_name : public ACE_Method_Request public: Method_Request_name (Prime_Scheduler *, ACE_Future<const ACE_TCHAR*> &); - virtual ~Method_Request_name (); + ~Method_Request_name () override; /// This is the entry point into the Active Object method. - virtual int call (); + int call () override; private: Prime_Scheduler *scheduler_; @@ -201,8 +201,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (); - virtual int call (); + ~Method_Request_end () override; + int call () override; private: Prime_Scheduler *scheduler_; diff --git a/ACE/tests/Future_Test.cpp b/ACE/tests/Future_Test.cpp index c42b7630a40..a1bdd6867c7 100644 --- a/ACE/tests/Future_Test.cpp +++ b/ACE/tests/Future_Test.cpp @@ -65,14 +65,14 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Initializer. - virtual int open (void *args = 0); + int open (void *args = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Terminator. virtual int shutdown (); /// Destructor. - virtual ~Prime_Scheduler (); + ~Prime_Scheduler () override; // = These methods are part of the Active Object Proxy interface. ACE_Future<u_long> work (u_long param, int count = 1); @@ -82,7 +82,7 @@ public: protected: /// Runs the Prime_Scheduler's event loop, which dequeues /// <Method_Requests> and dispatches them. - virtual int svc (); + int svc () override; // = These are the Servant methods that do the actual work. u_long work_i (u_long, int); @@ -107,10 +107,10 @@ public: u_long, int, ACE_Future<u_long> &); - virtual ~Method_Request_work (); + ~Method_Request_work () override; /// This is the entry point into the Active Object method. - virtual int call (); + int call () override; private: Prime_Scheduler *scheduler_; @@ -165,10 +165,10 @@ class Method_Request_name : public ACE_Method_Request public: Method_Request_name (Prime_Scheduler *, ACE_Future<const ACE_TCHAR*> &); - virtual ~Method_Request_name (); + ~Method_Request_name () override; /// This is the entry point into the Active Object method. - virtual int call (); + int call () override; private: Prime_Scheduler *scheduler_; @@ -207,8 +207,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Prime_Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (); - virtual int call (); + ~Method_Request_end () override; + int call () override; private: Prime_Scheduler *scheduler_; diff --git a/ACE/tests/Log_Msg_Backend_Test.cpp b/ACE/tests/Log_Msg_Backend_Test.cpp index 0b7bf970113..8a37c7a118a 100644 --- a/ACE/tests/Log_Msg_Backend_Test.cpp +++ b/ACE/tests/Log_Msg_Backend_Test.cpp @@ -25,15 +25,15 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int open (const ACE_TCHAR *logger_key); + int open (const ACE_TCHAR *logger_key) override; - virtual int reset (); + int reset () override; //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (); + int close () override; - virtual ssize_t log (ACE_Log_Record &log_record); + ssize_t log (ACE_Log_Record &log_record) override; // Test probes to see if things worked as specified. bool hooks_ok () const; diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index aa18c7180d7..66f725a61b6 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -54,7 +54,7 @@ public: Logger (bool be_recursive = true); /// Logging callback - void log (ACE_Log_Record &log_record); + void log (ACE_Log_Record &log_record) override; void verbose (bool be_verbose); @@ -367,7 +367,7 @@ public: } /// Logging callback - void log (ACE_Log_Record &) + void log (ACE_Log_Record &) override { ++count_; } @@ -586,7 +586,7 @@ public: Log_Spec_Verify (bool be_recursive = true) : fail_ (0), tests_ (0), recursive_ (be_recursive) {}; /// Logging callback - void log (ACE_Log_Record &log_record); + void log (ACE_Log_Record &log_record) override; int result (); diff --git a/ACE/tests/Log_Thread_Inheritance_Test.cpp b/ACE/tests/Log_Thread_Inheritance_Test.cpp index 78c4f687fba..7f35886b04c 100644 --- a/ACE/tests/Log_Thread_Inheritance_Test.cpp +++ b/ACE/tests/Log_Thread_Inheritance_Test.cpp @@ -19,7 +19,7 @@ int run_main (int, ACE_TCHAR *[]) #ifdef ACE_HAS_PTHREADS struct Inheritor : ACE_Task_Base { - int svc () + int svc () override { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - this test might crash ACE if it does not " "have the fix for the second bug in #3480.\n")); @@ -69,7 +69,7 @@ struct MyThread : ACE_Task_Base bool openfile_; static MyThread childthread_; - int svc () + int svc () override { if (openfile_) { diff --git a/ACE/tests/MT_NonBlocking_Connect_Test.cpp b/ACE/tests/MT_NonBlocking_Connect_Test.cpp index 6d9537c8e21..6402fc7d8bf 100644 --- a/ACE/tests/MT_NonBlocking_Connect_Test.cpp +++ b/ACE/tests/MT_NonBlocking_Connect_Test.cpp @@ -63,9 +63,9 @@ public: Svc_Handler (ACE_Thread_Manager *); - int open (void *); + int open (void *) override; - int close (u_long flags); + int close (u_long flags) override; bool connected_; }; @@ -98,7 +98,7 @@ class Concurrency_Strategy : public ACE_Concurrency_Strategy<SVC_HANDLER> { public: - virtual int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg); + int activate_svc_handler (SVC_HANDLER *svc_handler, void *arg) override; }; template<class SVC_HANDLER> int @@ -144,7 +144,7 @@ public: &this->cns_, &this->cts_, &this->cys_); } - int svc (); + int svc () override; private: ACE_Reactor &reactor_; diff --git a/ACE/tests/MT_Reactor_Upcall_Test.cpp b/ACE/tests/MT_Reactor_Upcall_Test.cpp index 29bcb871186..207233b05aa 100644 --- a/ACE/tests/MT_Reactor_Upcall_Test.cpp +++ b/ACE/tests/MT_Reactor_Upcall_Test.cpp @@ -68,7 +68,7 @@ class Handler : public ACE_Event_Handler { public: Handler (ACE_Reactor &reactor); - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; ACE_Pipe pipe_; int number_of_messages_read_; @@ -178,7 +178,7 @@ class Event_Loop_Task : public ACE_Task_Base { public: Event_Loop_Task (ACE_Reactor &reactor); - int svc (); + int svc () override; private: ACE_Reactor &reactor_; diff --git a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp index 762a67959c5..f9d2d2156c6 100644 --- a/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Event_Handler_Test.cpp @@ -230,9 +230,9 @@ public: Sender (ACE_HANDLE handle, Connection_Cache &connection_cache); - ~Sender (); + ~Sender () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; ssize_t send_message (); @@ -365,7 +365,7 @@ public: Event_Loop_Thread (ACE_Thread_Manager &thread_manager, ACE_Reactor &reactor); - int svc (); + int svc () override; ACE_Reactor &reactor_; @@ -379,17 +379,17 @@ public: ACE_HANDLE handle, int nested_upcalls); - ~Receiver (); + ~Receiver () override; - int svc (); + int svc () override; //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - int close (u_long flags); + int close (u_long flags) override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - int resume_handler (); + int resume_handler () override; ACE_HANDLE handle_; @@ -769,7 +769,7 @@ public: int run_receiver_thread, int nested_upcalls); - int svc (); + int svc () override; Sender *create_connection (); @@ -977,7 +977,7 @@ public: int make_invocations, int run_receiver_thread); - int svc (); + int svc () override; ACE_Auto_Event &new_connection_event_; @@ -1110,7 +1110,7 @@ public: ACE_Reactor &reactor, Connection_Cache &connection_cache); - int svc (); + int svc () override; ACE_Reactor &reactor_; diff --git a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp index 5cce754c683..a1ba7346316 100644 --- a/ACE/tests/MT_Reference_Counted_Notify_Test.cpp +++ b/ACE/tests/MT_Reference_Counted_Notify_Test.cpp @@ -40,13 +40,13 @@ public: Reference_Counted_Event_Handler (); - ~Reference_Counted_Event_Handler (); + ~Reference_Counted_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - ACE_Event_Handler::Reference_Count add_reference (); + ACE_Event_Handler::Reference_Count add_reference () override; - ACE_Event_Handler::Reference_Count remove_reference (); + ACE_Event_Handler::Reference_Count remove_reference () override; }; @@ -134,9 +134,9 @@ public: Simple_Event_Handler (int notifies); - ~Simple_Event_Handler (); + ~Simple_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; int notifies_; }; @@ -177,7 +177,7 @@ public: ACE_Reactor &reactor, int extra_iterations_needed); - int svc (); + int svc () override; ACE_Reactor &reactor_; diff --git a/ACE/tests/Message_Block_Test.cpp b/ACE/tests/Message_Block_Test.cpp index 32a3b43b239..2dd86736e0e 100644 --- a/ACE/tests/Message_Block_Test.cpp +++ b/ACE/tests/Message_Block_Test.cpp @@ -35,7 +35,7 @@ class User_Data : public ACE_Data_Block public: User_Data() {} - ~User_Data() + ~User_Data() override { ACE_DEBUG((LM_DEBUG, ACE_TEXT ("User_Data dtor\n"))); user_data_dtor_called = true; @@ -62,16 +62,16 @@ public: /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (); + int svc () override; /// Allows the producer to pass messages to the <Message_Block>. - virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); + int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0) override; private: //FUZZ: disable check_for_lack_ACE_OS /// Close hook. ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long); + int close (u_long) override; }; int diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp index 2b677fc85c7..91cb7138a5d 100644 --- a/ACE/tests/Message_Queue_Notifications_Test.cpp +++ b/ACE/tests/Message_Queue_Notifications_Test.cpp @@ -62,9 +62,9 @@ public: Message_Handler (ACE_Reactor &reactor); // = Demuxing hooks. - virtual int handle_input (ACE_HANDLE); - virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE); - virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); + int handle_input (ACE_HANDLE) override; + int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; + int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; private: int process_message (); @@ -84,7 +84,7 @@ class Watermark_Test : public ACE_Task<ACE_SYNCH> public: Watermark_Test (); - virtual int svc (); + int svc () override; int consumer (); int producer (); diff --git a/ACE/tests/Message_Queue_Test.cpp b/ACE/tests/Message_Queue_Test.cpp index 9a32ac909f3..5e602a39fd9 100644 --- a/ACE/tests/Message_Queue_Test.cpp +++ b/ACE/tests/Message_Queue_Test.cpp @@ -91,7 +91,7 @@ class Counting_Test_Producer : public ACE_Task<ACE_MT_SYNCH> public: Counting_Test_Producer (ACE_Message_Queue<ACE_MT_SYNCH> *queue) : ACE_Task<ACE_MT_SYNCH> (0, queue), sequence_ (0), produced_ (0) {} - virtual int svc (); + int svc () override; ACE_Atomic_Op<ACE_Thread_Mutex, long> sequence_; ACE_Atomic_Op<ACE_Thread_Mutex, long> produced_; @@ -102,7 +102,7 @@ class Counting_Test_Consumer : public ACE_Task<ACE_MT_SYNCH> public: Counting_Test_Consumer (ACE_Message_Queue<ACE_MT_SYNCH> *queue) : ACE_Task<ACE_MT_SYNCH> (0, queue), consumed_ (0) {} - virtual int svc (); + int svc () override; ACE_Atomic_Op<ACE_Thread_Mutex, long> consumed_; }; diff --git a/ACE/tests/Monotonic_Message_Queue_Test.cpp b/ACE/tests/Monotonic_Message_Queue_Test.cpp index 3d1232da5a2..2e18f66a567 100644 --- a/ACE/tests/Monotonic_Message_Queue_Test.cpp +++ b/ACE/tests/Monotonic_Message_Queue_Test.cpp @@ -61,9 +61,9 @@ class MyTask : public ACE_Task<ACE_MT_SYNCH> public: MyTask () : my_reactor_ (0), my_tq_ (0) {} - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (); + int svc () override; int start (int num_threads); int stop (); @@ -189,8 +189,8 @@ public: mq_ (mq) {} - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + int handle_timeout (const ACE_Time_Value &tv, + const void *arg) override; bool trigger_in(const ACE_Time_Value &delay); diff --git a/ACE/tests/Monotonic_Task_Test.cpp b/ACE/tests/Monotonic_Task_Test.cpp index b64e467b1a0..4e86cc27175 100644 --- a/ACE/tests/Monotonic_Task_Test.cpp +++ b/ACE/tests/Monotonic_Task_Test.cpp @@ -80,9 +80,9 @@ public: this->thr_mgr (&this->tm_); } - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (); + int svc () override; int start (); diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp index 5ff1243031a..f07d65e65c8 100644 --- a/ACE/tests/Multicast_Test.cpp +++ b/ACE/tests/Multicast_Test.cpp @@ -442,7 +442,7 @@ class MCT_Event_Handler : public ACE_Event_Handler public: MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (); + ~MCT_Event_Handler () override; int join (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, @@ -451,10 +451,10 @@ public: const ACE_TCHAR *net_if = 0); // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) override; - virtual ACE_HANDLE get_handle () const; + ACE_HANDLE get_handle () const override; // Turn loopback on/off. Must be called after at least 1 join() is performed. int loopback (bool on_off); @@ -652,14 +652,14 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> public: MCT_Task (const MCT_Config &config, ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (); + ~MCT_Task () override; //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. - virtual int open (void *args = 0); + int open (void *args = 0) override; //FUZZ: enable check_for_lack_ACE_OS - virtual int svc (); + int svc () override; private: const MCT_Config &config_; diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 37f186b1a58..0eda873a68c 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -458,7 +458,7 @@ class MCT_Event_Handler : public ACE_Event_Handler public: MCT_Event_Handler (ACE_SOCK_Dgram_Mcast::options options = ACE_SOCK_Dgram_Mcast::DEFOPTS); - virtual ~MCT_Event_Handler (); + ~MCT_Event_Handler () override; int join (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, @@ -467,10 +467,10 @@ public: const ACE_TCHAR *net_if = 0); // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask); + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE fd, ACE_Reactor_Mask close_mask) override; - virtual ACE_HANDLE get_handle () const; + ACE_HANDLE get_handle () const override; protected: ACE_SOCK_Dgram_Mcast *mcast (); @@ -656,12 +656,12 @@ class MCT_Task : public ACE_Task<ACE_NULL_SYNCH> public: MCT_Task (const MCT_Config &config, ACE_Reactor *reactor = ACE_Reactor::instance ()); - ~MCT_Task (); + ~MCT_Task () override; //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. - virtual int open (void *args = 0); - virtual int svc (); + int open (void *args = 0) override; + int svc () override; //FUZZ: enable check_for_lack_ACE_OS private: diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp index 13301f58711..84f61e6ff43 100644 --- a/ACE/tests/Notify_Performance_Test.cpp +++ b/ACE/tests/Notify_Performance_Test.cpp @@ -53,7 +53,7 @@ class Handler : public ACE_Event_Handler { public: /// The Handler callbacks. - virtual int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE); + int handle_exception (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; }; int diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 6a5f62ad7b0..91a16596730 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -43,10 +43,10 @@ public: * priority. *FUZZ: enable check_for_lack_ACE_OS */ - int open (void *); + int open (void *) override; /// Runs on a separate thread an checks the priority. - int svc (); + int svc () override; /// Returns 1 if priority was set properly, 0 otherwise. int succeeded () { return error_ == 0; } diff --git a/ACE/tests/Proactor_File_Test.cpp b/ACE/tests/Proactor_File_Test.cpp index 0181d114995..39614badfa5 100644 --- a/ACE/tests/Proactor_File_Test.cpp +++ b/ACE/tests/Proactor_File_Test.cpp @@ -46,24 +46,24 @@ class FileIOHandler : public ACE_Handler { public: FileIOHandler (); - virtual ~FileIOHandler (); + ~FileIOHandler () override; int Connect(); // This method will be called when an asynchronous read // completes on a file. - virtual void - handle_read_file(const ACE_Asynch_Read_File::Result &result); + void + handle_read_file(const ACE_Asynch_Read_File::Result &result) override; // This method will be called when an asynchronous write // completes on a file. - virtual void - handle_write_file(const ACE_Asynch_Write_File::Result &result); + void + handle_write_file(const ACE_Asynch_Write_File::Result &result) override; // Callback hook invoked by the Proactor's Timer_Queue. - virtual void - handle_time_out(const ACE_Time_Value &tv, const void *arg); + void + handle_time_out(const ACE_Time_Value &tv, const void *arg) override; // Our I/O objects; they're public so others can access them ACE_Asynch_Read_File reader_; diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp index ffc7cba3df7..dadc6f24e7e 100644 --- a/ACE/tests/Proactor_Test.cpp +++ b/ACE/tests/Proactor_Test.cpp @@ -169,13 +169,13 @@ public: sem_ ((unsigned int) 0), proactor_(0) {} - virtual ~MyTask() + ~MyTask() override { (void) this->stop (); (void) this->delete_proactor(); } - virtual int svc (); + int svc () override; int start (int num_threads, ProactorType type_proactor, @@ -621,10 +621,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server> { public: Acceptor (TestData *tester); - virtual ~Acceptor (); + ~Acceptor () override; // Virtual from ACE_Asynch_Acceptor - Server *make_handler (); + Server *make_handler () override; private: TestData *tester_; @@ -1055,12 +1055,12 @@ class Connector : public ACE_Asynch_Connector<Client> { public: Connector (TestData *tester); - virtual ~Connector (); + ~Connector () override; int start (const ACE_INET_Addr &addr, int num); // Virtual from ACE_Asynch_Connector - Client *make_handler (); + Client *make_handler () override; private: TestData *tester_; diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index f35a9f99a27..a4ca1dd4412 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -170,13 +170,13 @@ public: sem_ ((unsigned int) 0), proactor_(0) {} - virtual ~MyTask() + ~MyTask() override { (void) this->stop (); (void) this->delete_proactor(); } - virtual int svc (); + int svc () override; int start (int num_threads, ProactorType type_proactor, @@ -622,10 +622,10 @@ class Acceptor : public ACE_Asynch_Acceptor<Server> { public: Acceptor (TestData *tester); - virtual ~Acceptor (); + ~Acceptor () override; // Virtual from ACE_Asynch_Acceptor - Server *make_handler (); + Server *make_handler () override; private: TestData *tester_; @@ -1056,12 +1056,12 @@ class Connector : public ACE_Asynch_Connector<Client> { public: Connector (TestData *tester); - virtual ~Connector (); + ~Connector () override; int start (const ACE_INET_Addr &addr, int num); // Virtual from ACE_Asynch_Connector - Client *make_handler (); + Client *make_handler () override; private: TestData *tester_; diff --git a/ACE/tests/Proactor_Timer_Test.cpp b/ACE/tests/Proactor_Timer_Test.cpp index a772a00933e..a247b1dcaed 100644 --- a/ACE/tests/Proactor_Timer_Test.cpp +++ b/ACE/tests/Proactor_Timer_Test.cpp @@ -39,7 +39,7 @@ public: Time_Handler (); /// Handle the timeout. - virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg); + void handle_time_out (const ACE_Time_Value &tv, const void *arg) override; /// Return our timer id. long timer_id () const; @@ -71,10 +71,10 @@ public: Repeat_Timer_Handler (const int repeat_time = REPEAT_INTERVAL) : repeat_secs_ (repeat_time), expirations_ (0) {}; - ~Repeat_Timer_Handler (); + ~Repeat_Timer_Handler () override; // Handle the timeout. - virtual void handle_time_out (const ACE_Time_Value &tv, const void *arg); + void handle_time_out (const ACE_Time_Value &tv, const void *arg) override; private: int repeat_secs_; diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index 1b50857b768..c4ccd4fe2af 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -163,13 +163,13 @@ public: sem_ ((unsigned int) 0), proactor_(0) {} - virtual ~MyTask() + ~MyTask() override { (void) this->stop (); (void) this->delete_proactor(); } - virtual int svc (); + int svc () override; int start (int num_threads, ProactorType type_proactor, @@ -377,7 +377,7 @@ class Server : public ACE_Handler public: Server (); Server (TestData *tester, int id); - ~Server (); + ~Server () override; int id () { return this->id_; } size_t get_total_snd () { return this->total_snd_; } @@ -398,11 +398,11 @@ protected: */ /// This is called when asynchronous <read> operation from the /// socket completes. - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); + void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override; /// This is called when an asynchronous <write> to the socket /// completes. - virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); + void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) override; private: int initiate_read (); @@ -434,7 +434,7 @@ class Client : public ACE_Handler public: Client (); Client (TestData *tester, int id); - ~Client (); + ~Client () override; void go (ACE_HANDLE h, const ACE_INET_Addr &server); int id () { return this->id_; } @@ -444,10 +444,10 @@ public: int get_total_r () { return this->total_r_; } // This is called when asynchronous reads from the socket complete - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); + void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override; // This is called when asynchronous writes from the socket complete - virtual void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result); + void handle_write_dgram (const ACE_Asynch_Write_Dgram::Result &result) override; void cancel (); @@ -758,10 +758,10 @@ class Master : public ACE_Handler { public: Master (TestData *tester, const ACE_INET_Addr &recv_addr, int expected); - ~Master (); + ~Master () override; // Called when dgram receive operation completes. - virtual void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result); + void handle_read_dgram (const ACE_Asynch_Read_Dgram::Result &result) override; private: void start_recv (); diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index 6dda518de15..02d89c320c4 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -39,15 +39,15 @@ class Exit_Handler : public ACE_Event_Handler public: Exit_Handler (const char *msg): msg_ (msg) { } - virtual ~Exit_Handler () { } + ~Exit_Handler () override { } - virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask) + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { delete this; return 0; } - virtual int handle_exit (ACE_Process *proc) + int handle_exit (ACE_Process *proc) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P) Exit_Handler(%C) got %d: %d\n"), @@ -176,7 +176,7 @@ public: // FUZZ: disable check_for_lack_ACE_OS /// FUZZ: enable check_for_lack_ACE_OS - int open (void*) + int open (void*) override { char tmp[10]; order += ACE_OS::itoa (sleep_time_, tmp, 10); @@ -185,7 +185,7 @@ public: return 0; } - int svc () + int svc () override { int result = 0; ACE_exitcode exitcode; @@ -217,7 +217,7 @@ public: // FUZZ: disable check_for_lack_ACE_OS /// FUZZ: enable check_for_lack_ACE_OS - int close (u_long) + int close (u_long) override { --running_tasks; return 0; diff --git a/ACE/tests/Reactor_Dispatch_Order_Test.cpp b/ACE/tests/Reactor_Dispatch_Order_Test.cpp index 1df24bf6e05..3046ae2294a 100644 --- a/ACE/tests/Reactor_Dispatch_Order_Test.cpp +++ b/ACE/tests/Reactor_Dispatch_Order_Test.cpp @@ -26,16 +26,16 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor); - ~Handler(); + ~Handler() override; int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg) override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; - ACE_HANDLE get_handle () const; + ACE_HANDLE get_handle () const override; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with diff --git a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp index 52867953927..0141e2394ba 100644 --- a/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp +++ b/ACE/tests/Reactor_Dispatch_Order_Test_Dev_Poll.cpp @@ -28,16 +28,16 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor); - ~Handler(); + ~Handler() override; int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg) override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; - ACE_HANDLE get_handle () const; + ACE_HANDLE get_handle () const override; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp index ba3c3f4a9d9..99d19eef281 100644 --- a/ACE/tests/Reactor_Exceptions_Test.cpp +++ b/ACE/tests/Reactor_Exceptions_Test.cpp @@ -32,8 +32,8 @@ class My_Handler : public ACE_Event_Handler, public ACE_SOCK_Dgram public: My_Handler (const ACE_INET_Addr &local_addr); - virtual ACE_HANDLE get_handle () const; - virtual int handle_input (ACE_HANDLE handle); + ACE_HANDLE get_handle () const override; + int handle_input (ACE_HANDLE handle) override; }; My_Handler::My_Handler (const ACE_INET_Addr &local_addr) @@ -76,7 +76,7 @@ My_Handler::handle_input (ACE_HANDLE) class My_Reactor : public ACE_Select_Reactor { public: - virtual int handle_events (ACE_Time_Value *max_wait_time) + int handle_events (ACE_Time_Value *max_wait_time) override { int ret = 0; @@ -94,7 +94,7 @@ public: return ret; } - virtual int handle_events (ACE_Time_Value &max_wait_time) + int handle_events (ACE_Time_Value &max_wait_time) override { return this->handle_events (&max_wait_time); } diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index 346b23eb76e..47bdfe3c429 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -31,7 +31,7 @@ public: void run(); /// Receive the notifications. - virtual int handle_exception(ACE_HANDLE); + int handle_exception(ACE_HANDLE) override; private: /** diff --git a/ACE/tests/Reactor_Notify_Test.cpp b/ACE/tests/Reactor_Notify_Test.cpp index 1543248ae43..08874f291c3 100644 --- a/ACE/tests/Reactor_Notify_Test.cpp +++ b/ACE/tests/Reactor_Notify_Test.cpp @@ -36,14 +36,14 @@ class Quiet_Notify_Tester : public ACE_Task<ACE_NULL_SYNCH> { public: Quiet_Notify_Tester () : result_ (0) {} - ~Quiet_Notify_Tester () { this->wait (); } + ~Quiet_Notify_Tester () override { this->wait (); } //FUZZ: disable check_for_lack_ACE_OS /// Start the reactor event thread. - virtual int open (void * = 0); + int open (void * = 0) override; // Run the reactor event loop. - virtual int svc (); + int svc () override; // Return the test result, 0 ok, -1 fail int result () const { return this->result_; } @@ -113,30 +113,30 @@ public: const ACE_Time_Value &tv); /// Destructor. - ~Supplier_Task (); + ~Supplier_Task () override; //FUZZ: disable check_for_lack_ACE_OS /// Make this an Active Object. - virtual int open (void * = 0); + int open (void * = 0) override; /// Close down the supplier. ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long); + int close (u_long) override; /// Generates events and sends them to the <Reactor>'s <notify> /// method. - virtual int svc (); + int svc () override; /// Releases the <waiter_> semaphore when called by the <Reactor>'s /// notify handler. - virtual int handle_exception (ACE_HANDLE); + int handle_exception (ACE_HANDLE) override; /** * Called every time through the main <ACE_Reactor> event loop to * illustrate the difference between "limited" and "unlimited" * notification. */ - virtual int handle_output (ACE_HANDLE); + int handle_output (ACE_HANDLE) override; /// Release the <waiter_>. void release (); @@ -447,7 +447,7 @@ run_test (int disable_notify_pipe, class Purged_Notify : public ACE_Event_Handler { - virtual int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) + int handle_exception (ACE_HANDLE = ACE_INVALID_HANDLE) override { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Got a notify that should have been purged!\n")), diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp index f77aa9817ac..f4d98da89e5 100644 --- a/ACE/tests/Reactor_Registration_Test.cpp +++ b/ACE/tests/Reactor_Registration_Test.cpp @@ -29,12 +29,12 @@ public: ACE_HANDLE read, ACE_HANDLE write); - ~Event_Handler (); + ~Event_Handler () override; - int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE); + int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_Reactor_Mask close_mask) override; ACE_Pipe pipe_; bool ok_; diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index b004f229abe..699cefa1ea9 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -36,13 +36,13 @@ public: protected: - virtual ~Bogus_Handler (); + ~Bogus_Handler () override; - virtual ACE_HANDLE get_handle () const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - virtual int resume_handler (); + 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: @@ -123,14 +123,14 @@ public: protected: - virtual ~Bad_Handler (); + ~Bad_Handler () override; private: - virtual ACE_HANDLE get_handle () 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 () const; diff --git a/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp b/ACE/tests/Reactor_Remove_Resume_Test_Dev_Poll.cpp index a7afb91d650..a28d8ff9ac2 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 (); + ~Bogus_Handler () override; - virtual ACE_HANDLE get_handle () const; - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); - virtual int resume_handler (); + 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: @@ -127,14 +127,14 @@ public: protected: - virtual ~Bad_Handler (); + ~Bad_Handler () override; private: - virtual ACE_HANDLE get_handle () 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 () const; diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp index 91ce23e8370..06158decf5c 100644 --- a/ACE/tests/Reactor_Timer_Test.cpp +++ b/ACE/tests/Reactor_Timer_Test.cpp @@ -33,12 +33,12 @@ public: Time_Handler (); /// Handle the timeout. - virtual int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + int handle_timeout (const ACE_Time_Value &tv, + const void *arg) override; /// Called when <Time_Handler> is removed. - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; /// Return our timer id. long timer_id () const; diff --git a/ACE/tests/Reactors_Test.cpp b/ACE/tests/Reactors_Test.cpp index eea5ad4abaa..c174fce9773 100644 --- a/ACE/tests/Reactors_Test.cpp +++ b/ACE/tests/Reactors_Test.cpp @@ -33,19 +33,19 @@ class Test_Task : public ACE_Task<ACE_MT_SYNCH> { public: Test_Task (); - ~Test_Task (); + ~Test_Task () override; //FUZZ: disable check_for_lack_ACE_OS // = Task hooks. ///FUZZ: enable check_for_lack_ACE_OS - virtual int open (void *args = 0); - virtual int close (u_long flags = 0); - virtual int svc (); + int open (void *args = 0) override; + int close (u_long flags = 0) override; + int svc () override; // = Event Handler hooks. - virtual int handle_input (ACE_HANDLE handle); - virtual int handle_close (ACE_HANDLE fd, - ACE_Reactor_Mask close_mask); + int handle_input (ACE_HANDLE handle) override; + int handle_close (ACE_HANDLE fd, + ACE_Reactor_Mask close_mask) override; private: /// Number of iterations handled. size_t handled_; diff --git a/ACE/tests/Recursive_Condition_Bug_Test.cpp b/ACE/tests/Recursive_Condition_Bug_Test.cpp index 7d384d27d55..81de69e74ff 100644 --- a/ACE/tests/Recursive_Condition_Bug_Test.cpp +++ b/ACE/tests/Recursive_Condition_Bug_Test.cpp @@ -34,7 +34,7 @@ class Test_Handler; class Test_Task : public ACE_Task<ACE_MT_SYNCH> { public: - virtual int svc () + int svc () override { while (--max_iterations > 0) { @@ -72,7 +72,7 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - virtual int open (void * = 0) + int open (void * = 0) override { //FUZZ: enable check_for_lack_ACE_OS if (ACE_Task<ACE_MT_SYNCH>::activate (THR_NEW_LWP, 1) != 0) @@ -95,8 +95,8 @@ private: class Test_Handler : public ACE_Event_Handler { public: - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + int handle_timeout (const ACE_Time_Value &, + const void *arg) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n"))); diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp index 4d1ceac0837..72cba9e06ec 100644 --- a/ACE/tests/Recursive_Condition_Test.cpp +++ b/ACE/tests/Recursive_Condition_Test.cpp @@ -30,8 +30,8 @@ public: Test_Handler () : nr_expirations_ (0) {} int nr_expirations () { return this->nr_expirations_; } - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + int handle_timeout (const ACE_Time_Value &, + const void *arg) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n"))); ++this->nr_expirations_; diff --git a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp index d251793a8cc..e66449d255e 100644 --- a/ACE/tests/Refcounted_Auto_Ptr_Test.cpp +++ b/ACE/tests/Refcounted_Auto_Ptr_Test.cpp @@ -75,14 +75,14 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Initializer. - virtual int open (void *args = 0); + int open (void *args = 0) override; /// Terminator. - virtual int close (u_long flags = 0); + int close (u_long flags = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Destructor. - virtual ~Scheduler (); + ~Scheduler () override; // = These methods are part of the Active Object Proxy interface. void print (Printer_var &printer); @@ -91,7 +91,7 @@ public: protected: /// Runs the Scheduler's event loop, which dequeues <Method_Requests> /// and dispatches them. - virtual int svc (); + int svc () override; private: // = These are the <Scheduler> implementation details. @@ -107,10 +107,10 @@ class Method_Request_print : public ACE_Method_Request { public: explicit Method_Request_print (Printer_var &printer); - virtual ~Method_Request_print (); + ~Method_Request_print () override; /// This is the entry point into the Active Object method. - virtual int call (); + int call () override; private: Printer_var printer_; @@ -156,8 +156,8 @@ class Method_Request_end : public ACE_Method_Request { public: Method_Request_end (Scheduler *new_Prime_Scheduler); - virtual ~Method_Request_end (); - virtual int call (); + ~Method_Request_end () override; + int call () override; private: Scheduler *scheduler_; diff --git a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp index 9f03d0e9e8a..92bad5dd0dd 100644 --- a/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp +++ b/ACE/tests/Refcounted_Event_Handler_Test_DevPoll.cpp @@ -32,16 +32,16 @@ class Handler : public ACE_Event_Handler public: Handler (ACE_Reactor &reactor); - ~Handler(); + ~Handler() override; int handle_timeout (const ACE_Time_Value &tv, - const void *arg); + const void *arg) override; - int handle_input (ACE_HANDLE fd); + int handle_input (ACE_HANDLE fd) override; - int handle_output (ACE_HANDLE fd); + int handle_output (ACE_HANDLE fd) override; - ACE_HANDLE get_handle () const; + ACE_HANDLE get_handle () const override; // We need to add MSG_OOB data transfer to this test to check the // order of when <handle_exception> gets called. I tried with diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index aa02f058f99..61ab493c66c 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -43,23 +43,23 @@ public: Reference_Counted_Event_Handler (int &events); - ~Reference_Counted_Event_Handler (); + ~Reference_Counted_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - int handle_output (ACE_HANDLE); + int handle_output (ACE_HANDLE) override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; - int handle_signal (int, siginfo_t *, ucontext_t *); + int handle_signal (int, siginfo_t *, ucontext_t *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; - ACE_Event_Handler::Reference_Count add_reference (); + ACE_Event_Handler::Reference_Count add_reference () override; - ACE_Event_Handler::Reference_Count remove_reference (); + ACE_Event_Handler::Reference_Count remove_reference () override; ACE_Pipe pipe_; @@ -474,19 +474,19 @@ public: Simple_Event_Handler (int &events, int close_count); - ~Simple_Event_Handler (); + ~Simple_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; - int handle_output (ACE_HANDLE); + int handle_output (ACE_HANDLE) override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; - int handle_signal (int, siginfo_t *, ucontext_t *); + int handle_signal (int, siginfo_t *, ucontext_t *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; ACE_Pipe pipe_; @@ -772,16 +772,16 @@ public: Closed_In_Upcall_Event_Handler (int &events); - ~Closed_In_Upcall_Event_Handler (); + ~Closed_In_Upcall_Event_Handler () override; - int handle_input (ACE_HANDLE); + int handle_input (ACE_HANDLE) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; - ACE_Event_Handler::Reference_Count add_reference (); + ACE_Event_Handler::Reference_Count add_reference () override; - ACE_Event_Handler::Reference_Count remove_reference (); + ACE_Event_Handler::Reference_Count remove_reference () override; ACE_Pipe pipe_; diff --git a/ACE/tests/SOCK_Netlink_Test.cpp b/ACE/tests/SOCK_Netlink_Test.cpp index c2d2c07f045..d4c8e08bd2a 100644 --- a/ACE/tests/SOCK_Netlink_Test.cpp +++ b/ACE/tests/SOCK_Netlink_Test.cpp @@ -203,7 +203,7 @@ public: Secondary_Ipaddr_Handler (); // Destructor - virtual ~Secondary_Ipaddr_Handler (); + ~Secondary_Ipaddr_Handler () override; //FUZZ: disable check_for_lack_ACE_OS // Initialization. Schedules a timer to run start the business. @@ -214,21 +214,21 @@ public: const char *const if_name); // Returns reference to netlink socket. Necessary for reactor. - virtual ACE_HANDLE get_handle () const; + ACE_HANDLE get_handle () const override; /** * Takes care of the input. Reads the incoming messages, * makes their processing. */ - virtual int handle_input (ACE_HANDLE handle); + int handle_input (ACE_HANDLE handle) override; // Makes clean-up - virtual int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + int handle_close (ACE_HANDLE handle, + ACE_Reactor_Mask close_mask) override; // Runs a state machine. Controls adding/deleting of ip-address. int handle_timeout (ACE_Time_Value const & tv, - void const * arg = 0); + void const * arg = 0) override; // Sends to kernel a request to add secondary ip/mask to an // interface. diff --git a/ACE/tests/Service_Config_Stream_Test.cpp b/ACE/tests/Service_Config_Stream_Test.cpp index 7bbf520fd92..9c490dff055 100644 --- a/ACE/tests/Service_Config_Stream_Test.cpp +++ b/ACE/tests/Service_Config_Stream_Test.cpp @@ -32,7 +32,7 @@ class Static_Task : public ACE_Task<ACE_SYNCH> { public: - int open (void *) + int open (void *) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("opening %s\n"), @@ -40,7 +40,7 @@ public: return 0; } - int close (u_long) + int close (u_long) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("closing %s\n"), @@ -48,7 +48,7 @@ public: return 0; } - int init (int, ACE_TCHAR *[]) + int init (int, ACE_TCHAR *[]) override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("initializing %s\n"), @@ -56,7 +56,7 @@ public: return 0; } - int fini () + int fini () override { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("finalizing %s\n"), diff --git a/ACE/tests/Sig_Handlers_Test.cpp b/ACE/tests/Sig_Handlers_Test.cpp index df5ff2e3929..495fc85aadc 100644 --- a/ACE/tests/Sig_Handlers_Test.cpp +++ b/ACE/tests/Sig_Handlers_Test.cpp @@ -38,12 +38,12 @@ public: Test_SIGINT_Handler::registration_count_++; } - ~Test_SIGINT_Handler() + ~Test_SIGINT_Handler() override { ACE_TEST_ASSERT (Test_SIGINT_Handler::handle_signal_count_ == Test_SIGINT_Handler::registration_count_); } - virtual int handle_signal (int signal, siginfo_t *, ucontext_t *) + int handle_signal (int signal, siginfo_t *, ucontext_t *) override { ACE_TEST_ASSERT (signal == SIGINT); ACE_DEBUG ((LM_DEBUG, @@ -77,7 +77,7 @@ public: result)); } - virtual int handle_signal (int signal, siginfo_t *, ucontext_t *) + int handle_signal (int signal, siginfo_t *, ucontext_t *) override { ACE_TEST_ASSERT (signal == SIGINT); ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index 50391d41809..48691c478c4 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -127,9 +127,9 @@ public: MyTask (): sem_ ((unsigned int) 0), my_reactor_ (0) {} - virtual ~MyTask () { stop (); } + ~MyTask () override { stop (); } - virtual int svc (); + int svc () override; int start (int num_threads); int stop (); diff --git a/ACE/tests/TSS_Leak_Test.cpp b/ACE/tests/TSS_Leak_Test.cpp index 0c4d33daa77..e405fa2a216 100644 --- a/ACE/tests/TSS_Leak_Test.cpp +++ b/ACE/tests/TSS_Leak_Test.cpp @@ -20,7 +20,7 @@ struct Task : ACE_Task_Base { explicit Task (ACE_TSS<X> *tss) : tss_(tss) {} - int svc () + int svc () override { X *x = *tss_; ACE_UNUSED_ARG (x); diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp index 58cabe0f0fe..b15d5bb57a6 100644 --- a/ACE/tests/Task_Ex_Test.cpp +++ b/ACE/tests/Task_Ex_Test.cpp @@ -40,10 +40,10 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// activate/spawn the threads. ///FUZZ: enable check_for_lack_ACE_OS - int open (void*); + int open (void*) override; /// svc thread entry point - virtual int svc (); + int svc () override; private: }; diff --git a/ACE/tests/Task_Group_Test.cpp b/ACE/tests/Task_Group_Test.cpp index 6ea79c9b501..d46c32597a1 100644 --- a/ACE/tests/Task_Group_Test.cpp +++ b/ACE/tests/Task_Group_Test.cpp @@ -28,7 +28,7 @@ class Waiter_Task : public ACE_Task_Base public: Waiter_Task (ACE_Thread_Manager* tm = 0) : ACE_Task_Base (tm) {} - virtual int svc(); + int svc() override; }; int diff --git a/ACE/tests/Task_Test.cpp b/ACE/tests/Task_Test.cpp index de05a529df7..29168a8a423 100644 --- a/ACE/tests/Task_Test.cpp +++ b/ACE/tests/Task_Test.cpp @@ -30,8 +30,8 @@ static ACE_Atomic_Op<ACE_Thread_Mutex, int> close_cleanups (0); class My_Thread_Hook : public ACE_Thread_Hook { public: - virtual ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func, - void *arg); + ACE_THR_FUNC_RETURN start (ACE_THR_FUNC func, + void *arg) override; }; class Barrier_Task : public ACE_Task<ACE_MT_SYNCH> @@ -43,11 +43,11 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long flags = 0); + int close (u_long flags = 0) override; /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (); + int svc () override; private: /// Reference to the tester barrier. This controls each iteration of diff --git a/ACE/tests/Task_Wait_Test.cpp b/ACE/tests/Task_Wait_Test.cpp index 2a798a0923d..0638e66ffae 100644 --- a/ACE/tests/Task_Wait_Test.cpp +++ b/ACE/tests/Task_Wait_Test.cpp @@ -33,9 +33,9 @@ static ACE_Event TaskDone; class Do_Nothing_Task : public ACE_Task_Base { public: - virtual int close (u_long flags = 0); + int close (u_long flags = 0) override; - virtual int svc (); + int svc () override; }; // close tries to wait for other threads. There aren't any, but as long as diff --git a/ACE/tests/Thread_Attrs_Test.cpp b/ACE/tests/Thread_Attrs_Test.cpp index 9fc26475fae..3f70624918c 100644 --- a/ACE/tests/Thread_Attrs_Test.cpp +++ b/ACE/tests/Thread_Attrs_Test.cpp @@ -23,11 +23,11 @@ public: //FUZZ: disable check_for_lack_ACE_OS // Spawn the thread - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS // Check the cancel settings against what is expected then exit. - virtual int svc (); + int svc () override; /// Returns true iff settings match what was requested. bool operator! (); @@ -132,11 +132,11 @@ public: //FUZZ: disable check_for_lack_ACE_OS /// Spawn the thread - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Check the stack size against what is expected then exit. - virtual int svc (); + int svc () override; /// Returns true iff failed_ == false. bool operator! (); diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index da7e88ccde1..04d501e1eb6 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -57,11 +57,11 @@ public: Thread_Pool (int n_threads); /// Destructor... - ~Thread_Pool (); + ~Thread_Pool () override; /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (); + int svc () override; /// Start the threads in the pool. void start(); @@ -80,11 +80,11 @@ public: private: //FUZZ: disable check_for_lack_ACE_OS /// Spawn the threads in the pool. - virtual int open (void * = 0); + int open (void * = 0) override; /// Close hook. ///FUZZ: enable check_for_lack_ACE_OS - virtual int close (u_long); + int close (u_long) override; /// Total number of threads activated through this thread pool ever. ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> total_activated_threads_; diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp index 192c4ad8d48..5a991655193 100644 --- a/ACE/tests/Thread_Manager_Test.cpp +++ b/ACE/tests/Thread_Manager_Test.cpp @@ -147,7 +147,7 @@ class ThrMgr_Task : public ACE_Task_Base { public: ThrMgr_Task (ACE_Thread_Manager *); - virtual int svc (); + int svc () override; static int errors; }; diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 2e477d87013..0a76061e31a 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -45,7 +45,7 @@ public: Thread_Pool (int n_threads); /// Destructor... - ~Thread_Pool (); + ~Thread_Pool () override; /** * Activate the task's thread pool, produce the messages that are @@ -64,20 +64,20 @@ public: /// Iterate <n_iterations> time printing off a message and "waiting" /// for all other threads to complete this iteration. - virtual int svc (); + int svc () override; /// Allows the producer to pass messages to the <Thread_Pool>. - virtual int put (ACE_Message_Block *mb, - ACE_Time_Value *tv = 0); + int put (ACE_Message_Block *mb, + ACE_Time_Value *tv = 0) override; private: //FUZZ: disable check_for_lack_ACE_OS /// Spawn the threads in the pool. - virtual int open (void * = 0); + int open (void * = 0) override; //FUZZ: enable check_for_lack_ACE_OS /// Close hook. - virtual int close (u_long); + int close (u_long) override; /// Serialize access to <ACE_Message_Block> reference count, which /// will be decremented by multiple threads. diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp index 600f9cba8d5..c43357fdb5f 100644 --- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp +++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp @@ -130,7 +130,7 @@ class CTestEventHandler : public ICustomEventHandler /// Default destructor. /// /// @return - virtual ~CTestEventHandler() + ~CTestEventHandler() override { ACE_DEBUG((LM_DEBUG, ACE_TEXT("%I(%t) Destroying test event handler.\n"))); } @@ -139,7 +139,7 @@ class CTestEventHandler : public ICustomEventHandler /// /// @return int /// @param p_vParameter - virtual int operator() (void* p_vParameter) + int operator() (void* p_vParameter) override { long iParameter = ACE_Utils::truncate_cast<long> ((intptr_t)p_vParameter); diff --git a/ACE/tests/Timer_Cancellation_Test.cpp b/ACE/tests/Timer_Cancellation_Test.cpp index d60b0e62cc4..b4f3aa96d46 100644 --- a/ACE/tests/Timer_Cancellation_Test.cpp +++ b/ACE/tests/Timer_Cancellation_Test.cpp @@ -20,10 +20,10 @@ class Deadlock : public ACE_Task_Base { public: - int svc (); + int svc () override; int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + const void *act) override; }; int @@ -59,10 +59,10 @@ public: Event_Handler (Deadlock &deadlock); int handle_timeout (const ACE_Time_Value ¤t_time, - const void *act); + const void *act) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask close_mask); + ACE_Reactor_Mask close_mask) override; Deadlock &deadlock_; }; diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index f6a4975bbaf..13050ab67e1 100644 --- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -48,13 +48,13 @@ public: Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls); - ~Reference_Counted_Event_Handler (); + ~Reference_Counted_Event_Handler () override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask masks); + ACE_Reactor_Mask masks) override; int expected_number_of_handle_close_calls_; int number_of_handle_close_calls_; @@ -352,13 +352,13 @@ public: Simple_Event_Handler (); - ~Simple_Event_Handler (); + ~Simple_Event_Handler () override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; }; Simple_Event_Handler::Simple_Event_Handler () diff --git a/ACE/tests/Timer_Queue_Test.cpp b/ACE/tests/Timer_Queue_Test.cpp index 298f25353d3..0cfad45cc1e 100644 --- a/ACE/tests/Timer_Queue_Test.cpp +++ b/ACE/tests/Timer_Queue_Test.cpp @@ -54,15 +54,15 @@ class Example_Handler : public ACE_Event_Handler public: Example_Handler (): close_count_ (0) {} - virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) + int handle_close (ACE_HANDLE, ACE_Reactor_Mask mask) override { ACE_TEST_ASSERT (mask == ACE_Event_Handler::TIMER_MASK); this->close_count_++; return 0; } - virtual int handle_timeout (const ACE_Time_Value &, - const void *arg) + int handle_timeout (const ACE_Time_Value &, + const void *arg) override { int *act = (int *) arg; ACE_TEST_ASSERT (*act == 42 || *act == 007); @@ -84,7 +84,7 @@ struct Interval_Handler : public ACE_Event_Handler { Interval_Handler () : trip_count_ (0) { } - virtual int handle_timeout (const ACE_Time_Value & , const void *) + int handle_timeout (const ACE_Time_Value & , const void *) override { ++trip_count_; return 0; diff --git a/ACE/tests/Token_Strategy_Test.cpp b/ACE/tests/Token_Strategy_Test.cpp index 765ee91f7f1..be38354ffdf 100644 --- a/ACE/tests/Token_Strategy_Test.cpp +++ b/ACE/tests/Token_Strategy_Test.cpp @@ -33,13 +33,13 @@ public: Token_Strategy_Test (ACE_Token::QUEUEING_STRATEGY strategy = ACE_Token::FIFO, int threads = 5, int invocations = 10); - ~Token_Strategy_Test (); + ~Token_Strategy_Test () override; //FUZZ: disable check_for_lack_ACE_OS - int open (void *a = 0); + int open (void *a = 0) override; //FUZZ: enable check_for_lack_ACE_OS - int svc (); + int svc () override; private: // Number of threads for the test, must be 5 or more. |