summaryrefslogtreecommitdiff
path: root/src/util/timetaker.h
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2017-05-26 14:03:36 +0200
committerGitHub <noreply@github.com>2017-05-26 14:03:36 +0200
commitd99b6fed5517797bfafe4bbb307963967f0ca749 (patch)
tree0a4ff946a9d8bbcd1e921d3981eec96e988bc5c8 /src/util/timetaker.h
parent4d5ce8478c959a4ee5b13ef9ba7e46b28d089a21 (diff)
downloadminetest-d99b6fed5517797bfafe4bbb307963967f0ca749.tar.gz
minetest-d99b6fed5517797bfafe4bbb307963967f0ca749.tar.bz2
minetest-d99b6fed5517797bfafe4bbb307963967f0ca749.zip
Time: Change old `u32` timestamps to 64-bit (#5818)
MacOSX build fix + cleanups
Diffstat (limited to 'src/util/timetaker.h')
-rw-r--r--src/util/timetaker.h14
1 files changed, 7 insertions, 7 deletions
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