Index: src/libchcore/TTimestampProviderTickCount.cpp =================================================================== diff -u -N -r9b8cccbee0fcfeca28a112cc0253a7641f73f74f -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 --- src/libchcore/TTimestampProviderTickCount.cpp (.../TTimestampProviderTickCount.cpp) (revision 9b8cccbee0fcfeca28a112cc0253a7641f73f74f) +++ src/libchcore/TTimestampProviderTickCount.cpp (.../TTimestampProviderTickCount.cpp) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) @@ -19,25 +19,23 @@ #include "stdafx.h" #include "TTimestampProviderTickCount.h" -BEGIN_CHCORE_NAMESPACE - -TTimestampProviderTickCount::TTimestampProviderTickCount() : - m_dwLastTimestamp(0), - m_ullTimestampAdjustment(0) +namespace chcore { -} - -unsigned long long TTimestampProviderTickCount::GetCurrentTimestamp() const -{ - DWORD dwTimestamp = GetTickCount(); - if(dwTimestamp < m_dwLastTimestamp) + TTimestampProviderTickCount::TTimestampProviderTickCount() : + m_dwLastTimestamp(0), + m_ullTimestampAdjustment(0) { - m_ullTimestampAdjustment += (1ULL << 32); } - m_dwLastTimestamp = dwTimestamp; - return m_ullTimestampAdjustment + dwTimestamp; -} + unsigned long long TTimestampProviderTickCount::GetCurrentTimestamp() const + { + DWORD dwTimestamp = GetTickCount(); + if (dwTimestamp < m_dwLastTimestamp) + { + m_ullTimestampAdjustment += (1ULL << 32); + } + m_dwLastTimestamp = dwTimestamp; - -END_CHCORE_NAMESPACE + return m_ullTimestampAdjustment + dwTimestamp; + } +}