From 24ae6a6802da5fc3f90b075d21cd4275e7138441 Mon Sep 17 00:00:00 2001 From: Dehravor Date: Tue, 29 Apr 2014 16:35:11 +0200 Subject: Core/Misc: Remove obsolete C++11 backward compatibility macros OVERRIDE, FINAL, DELETE_MEMBER --- src/server/worldserver/RemoteAccess/RARunnable.h | 2 +- src/server/worldserver/RemoteAccess/RASocket.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/worldserver/RemoteAccess') diff --git a/src/server/worldserver/RemoteAccess/RARunnable.h b/src/server/worldserver/RemoteAccess/RARunnable.h index 052b532572e..540ac762f30 100644 --- a/src/server/worldserver/RemoteAccess/RARunnable.h +++ b/src/server/worldserver/RemoteAccess/RARunnable.h @@ -31,7 +31,7 @@ class RARunnable : public ACE_Based::Runnable public: RARunnable(); virtual ~RARunnable(); - void run() OVERRIDE; + void run() override; private: ACE_Reactor* m_Reactor; diff --git a/src/server/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h index ae201747010..2cbb14b3578 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.h +++ b/src/server/worldserver/RemoteAccess/RASocket.h @@ -37,9 +37,9 @@ class RASocket : public ACE_Svc_Handler RASocket(); virtual ~RASocket() { } - virtual int svc() OVERRIDE; - virtual int open(void* = 0) OVERRIDE; - virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE, ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) OVERRIDE; + virtual int svc() override; + virtual int open(void* = 0) override; + virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE, ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK) override; private: int recv_line(std::string& outLine); -- cgit v1.2.3