From d99b6fed5517797bfafe4bbb307963967f0ca749 Mon Sep 17 00:00:00 2001
From: SmallJoker <SmallJoker@users.noreply.github.com>
Date: Fri, 26 May 2017 14:03:36 +0200
Subject: Time: Change old `u32` timestamps to 64-bit (#5818)

MacOSX build fix + cleanups
---
 src/util/timetaker.cpp | 23 ++++++++---------------
 src/util/timetaker.h   | 14 +++++++-------
 2 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'src/util')

diff --git a/src/util/timetaker.cpp b/src/util/timetaker.cpp
index 0e92696ac..ac686c3a3 100644
--- a/src/util/timetaker.cpp
+++ b/src/util/timetaker.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "../log.h"
 #include <ostream>
 
-TimeTaker::TimeTaker(const char *name, u32 *result, TimePrecision prec)
+TimeTaker::TimeTaker(const std::string &name, u64 *result, TimePrecision prec)
 {
 	m_name = name;
 	m_result = result;
@@ -32,18 +32,13 @@ TimeTaker::TimeTaker(const char *name, u32 *result, TimePrecision prec)
 	m_time1 = porting::getTime(prec);
 }
 
-u32 TimeTaker::stop(bool quiet)
+u64 TimeTaker::stop(bool quiet)
 {
-	if(m_running)
-	{
-		u32 time2 = porting::getTime(m_precision);
-		u32 dtime = time2 - m_time1;
-		if(m_result != NULL)
-		{
+	if (m_running) {
+		u64 dtime = porting::getTime(m_precision) - m_time1;
+		if (m_result != NULL) {
 			(*m_result) += dtime;
-		}
-		else
-		{
+		} else {
 			if (!quiet) {
 				static const char* const units[] = {
 					"s"  /* PRECISION_SECONDS */,
@@ -62,10 +57,8 @@ u32 TimeTaker::stop(bool quiet)
 	return 0;
 }
 
-u32 TimeTaker::getTimerTime()
+u64 TimeTaker::getTimerTime()
 {
-	u32 time2 = porting::getTime(m_precision);
-	u32 dtime = time2 - m_time1;
-	return dtime;
+	return porting::getTime(m_precision) - m_time1;
 }
 
diff --git a/src/util/timetaker.h b/src/util/timetaker.h
index 5512c205f..c10f4f535 100644
--- a/src/util/timetaker.h
+++ b/src/util/timetaker.h
@@ -30,24 +30,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 class TimeTaker
 {
 public:
-	TimeTaker(const char *name, u32 *result=NULL,
-		TimePrecision=PRECISION_MILLI);
+	TimeTaker(const std::string &name, u64 *result=NULL,
+		TimePrecision prec=PRECISION_MILLI);
 
 	~TimeTaker()
 	{
 		stop();
 	}
 
-	u32 stop(bool quiet=false);
+	u64 stop(bool quiet=false);
 
-	u32 getTimerTime();
+	u64 getTimerTime();
 
 private:
-	const char *m_name;
-	u32 m_time1;
+	std::string m_name;
+	u64 m_time1;
 	bool m_running;
 	TimePrecision m_precision;
-	u32 *m_result;
+	u64 *m_result;
 };
 
 #endif
-- 
cgit v1.2.3