From 30b0325cee4a1b7b3992b80ea863483fc6fc0d30 Mon Sep 17 00:00:00 2001
From: Kargatum <dowlandtop@yandex.com>
Date: Tue, 26 Mar 2019 13:38:16 +0700
Subject: [PATCH] Core/Misc: Replace ACE_UINT* to uint* (#1628)

* Core/Common: Replace ACE_UINT* to uint*

* #include "Common.h"
---
 src/server/game/Maps/MapUpdater.cpp       | 14 +++++++-------
 src/server/game/Maps/MapUpdater.h         |  4 ++--
 src/server/game/Server/WorldSocket.cpp    |  2 +-
 src/server/game/Server/WorldSocketMgr.cpp |  4 ++--
 src/server/game/Server/WorldSocketMgr.h   |  5 +++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 3377b7455..3d1a07481 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -42,12 +42,12 @@ class MapUpdateRequest : public ACE_Method_Request
 
         Map& m_map;
         MapUpdater& m_updater;
-        ACE_UINT32 m_diff;
-        ACE_UINT32 s_diff;
+        uint32 m_diff;
+        uint32 s_diff;
 
     public:
 
-        MapUpdateRequest(Map& m, MapUpdater& u, ACE_UINT32 d, ACE_UINT32 sd)
+        MapUpdateRequest(Map& m, MapUpdater& u, uint32 d, uint32 sd)
             : m_map(m), m_updater(u), m_diff(d), s_diff(sd)
         {
         }
@@ -65,10 +65,10 @@ class LFGUpdateRequest : public ACE_Method_Request
     private:
 
         MapUpdater& m_updater;
-        ACE_UINT32 m_diff;
+        uint32 m_diff;
 
     public:
-        LFGUpdateRequest(MapUpdater& u, ACE_UINT32 d) : m_updater(u), m_diff(d) {}
+        LFGUpdateRequest(MapUpdater& u, uint32 d) : m_updater(u), m_diff(d) {}
 
         virtual int call()
         {
@@ -113,7 +113,7 @@ int MapUpdater::wait()
     return 0;
 }
 
-int MapUpdater::schedule_update(Map& map, ACE_UINT32 diff, ACE_UINT32 s_diff)
+int MapUpdater::schedule_update(Map& map, uint32 diff, uint32 s_diff)
 {
     TRINITY_GUARD(ACE_Thread_Mutex, m_mutex);
 
@@ -130,7 +130,7 @@ int MapUpdater::schedule_update(Map& map, ACE_UINT32 diff, ACE_UINT32 s_diff)
     return 0;
 }
 
-int MapUpdater::schedule_lfg_update(ACE_UINT32 diff)
+int MapUpdater::schedule_lfg_update(uint32 diff)
 {
     TRINITY_GUARD(ACE_Thread_Mutex, m_mutex);
 
diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index 7afbfd5cb..862f859ae 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -19,8 +19,8 @@ class MapUpdater
         friend class MapUpdateRequest;
         friend class LFGUpdateRequest;
 
-        int schedule_update(Map& map, ACE_UINT32 diff, ACE_UINT32 s_diff);
-        int schedule_lfg_update(ACE_UINT32 diff);
+        int schedule_update(Map& map, uint32 diff, uint32 s_diff);
+        int schedule_lfg_update(uint32 diff);
 
         int wait();
 
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index 2b22429c4..ac1d9372f 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -662,7 +662,7 @@ int WorldSocket::ProcessIncoming(WorldPacket* new_pct)
     // manage memory ;)
     ACE_Auto_Ptr<WorldPacket> aptr (new_pct);
 
-    const ACE_UINT16 opcode = new_pct->GetOpcode();
+    const uint16 opcode = new_pct->GetOpcode();
 
     if (closing_)
         return -1;
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index d5430f786..b8a1b9fa7 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -220,7 +220,7 @@ WorldSocketMgr::~WorldSocketMgr()
 }
 
 int
-WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address)
+WorldSocketMgr::StartReactiveIO (uint16 port, const char* address)
 {
     m_UseNoDelay = sConfigMgr->GetBoolDefault ("Network.TcpNodelay", true);
 
@@ -266,7 +266,7 @@ WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address)
 }
 
 int
-WorldSocketMgr::StartNetwork (ACE_UINT16 port, const char* address)
+WorldSocketMgr::StartNetwork (uint16 port, const char* address)
 {
     if (!sLog->IsOutDebug())
         ACE_Log_Msg::instance()->priority_mask (LM_ERROR, ACE_Log_Msg::PROCESS);
diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index dd48ca235..d33ec273a 100644
--- a/src/server/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
@@ -13,6 +13,7 @@
 #ifndef __WORLDSOCKETMGR_H
 #define __WORLDSOCKETMGR_H
 
+#include "Common.h"
 #include <ace/Basic_Types.h>
 #include <ace/Singleton.h>
 #include <ace/Thread_Mutex.h>
@@ -29,7 +30,7 @@ public:
     friend class ACE_Singleton<WorldSocketMgr, ACE_Thread_Mutex>;
 
     /// Start network, listen at address:port .
-    int StartNetwork(ACE_UINT16 port, const char* address);
+    int StartNetwork(uint16 port, const char* address);
 
     /// Stops all network threads, It will wait for all running threads .
     void StopNetwork();
@@ -40,7 +41,7 @@ public:
 private:
     int OnSocketOpen(WorldSocket* sock);
 
-    int StartReactiveIO(ACE_UINT16 port, const char* address);
+    int StartReactiveIO(uint16 port, const char* address);
 
 private:
     WorldSocketMgr();