diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-11-23 15:22:05 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-11-23 15:22:05 +0100 |
| commit | 6382989ba08727898587f34f505a03a9035511a2 (patch) | |
| tree | 42cc9f37175e636ba55193d4a04f385a0f46987a /Tools | |
| parent | Update GCC on Travis (diff) | |
| download | cuberite-6382989ba08727898587f34f505a03a9035511a2.tar cuberite-6382989ba08727898587f34f505a03a9035511a2.tar.gz cuberite-6382989ba08727898587f34f505a03a9035511a2.tar.bz2 cuberite-6382989ba08727898587f34f505a03a9035511a2.tar.lz cuberite-6382989ba08727898587f34f505a03a9035511a2.tar.xz cuberite-6382989ba08727898587f34f505a03a9035511a2.tar.zst cuberite-6382989ba08727898587f34f505a03a9035511a2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | Tools/ProtoProxy/Connection.cpp | 4 | ||||
| -rw-r--r-- | Tools/ProtoProxy/Connection.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index eaf4fab02..fe61b37d1 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -189,7 +189,7 @@ cConnection::cConnection(SOCKET a_ClientSocket, cServer & a_Server) : m_Server(a_Server), m_ClientSocket(a_ClientSocket), m_ServerSocket(-1), - m_BeginTick(m_Timer.GetNowTime()), + m_BeginTick(std::chrono::steady_clock::now()), m_ClientState(csUnencrypted), m_ServerState(csUnencrypted), m_Nonce(0), @@ -436,7 +436,7 @@ bool cConnection::RelayFromClient(void) double cConnection::GetRelativeTime(void) { - return (double)(m_Timer.GetNowTime() - m_BeginTick) / 1000; + return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - m_BeginTick).count() / 1000; } diff --git a/Tools/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h index 1fc9536de..c79273f8a 100644 --- a/Tools/ProtoProxy/Connection.h +++ b/Tools/ProtoProxy/Connection.h @@ -10,7 +10,6 @@ #pragma once #include "ByteBuffer.h" -#include "OSSupport/Timer.h" #include "PolarSSL++/AesCfb128Decryptor.h" #include "PolarSSL++/AesCfb128Encryptor.h" @@ -37,8 +36,7 @@ class cConnection SOCKET m_ClientSocket; SOCKET m_ServerSocket; - cTimer m_Timer; - long long m_BeginTick; // Tick when the relative time was first retrieved (used for GetRelativeTime()) + std::chrono::steady_clock::time_point m_BeginTick; // Tick when the relative time was first retrieved (used for GetRelativeTime()) enum eConnectionState { |