From 0aa92e826a816561b3af88fbe136b5fde520257c Mon Sep 17 00:00:00 2001 From: Luke Usher Date: Thu, 7 May 2020 12:40:01 +0100 Subject: [PATCH] fix compilation on new installs of vs2019 --- src/common/Timer.cpp | 2 +- src/common/Timer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Timer.cpp b/src/common/Timer.cpp index 024d6b038..0a055fc51 100644 --- a/src/common/Timer.cpp +++ b/src/common/Timer.cpp @@ -54,7 +54,7 @@ std::mutex TimerMtx; // Returns the current time of the timer -inline uint64_t GetTime_NS(TimerObject* Timer) +uint64_t GetTime_NS(TimerObject* Timer) { #ifdef _WIN32 LARGE_INTEGER li; diff --git a/src/common/Timer.h b/src/common/Timer.h index 742b66c7d..7d907ad62 100644 --- a/src/common/Timer.h +++ b/src/common/Timer.h @@ -60,7 +60,7 @@ TimerObject* Timer_Create(TimerCB Callback, void* Arg, std::string Name, unsigne void Timer_Start(TimerObject* Timer, uint64_t Expire_MS); void Timer_Exit(TimerObject* Timer); void Timer_ChangeExpireTime(TimerObject* Timer, uint64_t Expire_ms); -inline uint64_t GetTime_NS(TimerObject* Timer); +uint64_t GetTime_NS(TimerObject* Timer); void Timer_Init(); #endif