aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2015-07-21 20:42:07 +0200
committerNaios <naios-dev@live.de>2015-07-22 01:59:57 +0200
commit45058990e2d5b41ea80c32db350125f47456e0e8 (patch)
tree09796a933c9d5ad0edc4f9500860fc6298c1ddfc
parent4c0c6348144f0dc9de3e5aa97e0a5c43b164f443 (diff)
Core/Utilities: Remove global using of std::chrono namespace.
* never use "using namespace" in header files! (cherry picked from commit 6bf10c2b83063147737aee68d3b40a6d67e49d53)
-rw-r--r--src/server/game/Server/WorldSocket.cpp2
-rw-r--r--src/server/shared/Utilities/Timer.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index cff423c71c6..be70d67b4de 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -509,6 +509,8 @@ void WorldSocket::SendAuthResponseError(uint8 code)
bool WorldSocket::HandlePing(WorldPacket& recvPacket)
{
+ using namespace std::chrono;
+
uint32 ping;
uint32 latency;
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index b7d2fa1b5ad..c54903d7be2 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -21,10 +21,10 @@
#include <chrono>
-using namespace std::chrono;
-
inline uint32 getMSTime()
{
+ using namespace std::chrono;
+
static const system_clock::time_point ApplicationStartTime = system_clock::now();
return uint32(duration_cast<milliseconds>(system_clock::now() - ApplicationStartTime).count());