aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
diff options
context:
space:
mode:
authorDehravor <dehravor@gmail.com>2014-04-29 16:35:11 +0200
committerDehravor <dehravor@gmail.com>2014-04-29 16:35:11 +0200
commit24ae6a6802da5fc3f90b075d21cd4275e7138441 (patch)
tree3501d986aaf1ec9df27a873a16bf5b3e5dac2225 /src/server/worldserver
parent414554aefa8af569a96c952dcf36707c9c77c7cb (diff)
Core/Misc: Remove obsolete C++11 backward compatibility macros
OVERRIDE, FINAL, DELETE_MEMBER
Diffstat (limited to 'src/server/worldserver')
-rw-r--r--src/server/worldserver/CommandLine/CliRunnable.h2
-rw-r--r--src/server/worldserver/Master.cpp2
-rw-r--r--src/server/worldserver/RemoteAccess/RARunnable.h2
-rw-r--r--src/server/worldserver/RemoteAccess/RASocket.h6
-rw-r--r--src/server/worldserver/TCSoap/TCSoap.h2
-rw-r--r--src/server/worldserver/WorldThread/WorldRunnable.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/server/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h
index 0306109ab54..5510173973e 100644
--- a/src/server/worldserver/CommandLine/CliRunnable.h
+++ b/src/server/worldserver/CommandLine/CliRunnable.h
@@ -27,7 +27,7 @@
class CliRunnable : public ACE_Based::Runnable
{
public:
- void run() OVERRIDE;
+ void run() override;
};
#endif
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index c3075deb762..c5424374f5a 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -95,7 +95,7 @@ public:
void SetDelayTime(uint32 t) { _delaytime = t; }
- void run() OVERRIDE
+ void run() override
{
if (!_delaytime)
return;
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<ACE_SOCK_STREAM, ACE_MT_SYNCH>
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);
diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h
index 34a3b336464..427d37ef0cc 100644
--- a/src/server/worldserver/TCSoap/TCSoap.h
+++ b/src/server/worldserver/TCSoap/TCSoap.h
@@ -29,7 +29,7 @@ class TCSoapRunnable : public ACE_Based::Runnable
public:
TCSoapRunnable() : _port(0) { }
- void run() OVERRIDE;
+ void run() override;
void SetListenArguments(const std::string& host, uint16 port)
{
diff --git a/src/server/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h
index 563a6b03827..dfc74dd1e3a 100644
--- a/src/server/worldserver/WorldThread/WorldRunnable.h
+++ b/src/server/worldserver/WorldThread/WorldRunnable.h
@@ -27,7 +27,7 @@
class WorldRunnable : public ACE_Based::Runnable
{
public:
- void run() OVERRIDE;
+ void run() override;
};
#endif