github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

RTIMING fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@714 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-12-21 22:14:14 +00:00
parent c4bf62ed12
commit 6a4c062879
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Core/Profile.h
View file

@ -54,8 +54,8 @@ private:
};
#define RTIMING(x) \
static TimingInspector COMBINE(sTmStat, __LINE__)(x); \
TimingInspector::Routine COMBINE(sTmStatR, __LINE__)(COMBINE(sTmStat, __LINE__));
static UPP::TimingInspector COMBINE(sTmStat, __LINE__)(x); \
UPP::TimingInspector::Routine COMBINE(sTmStatR, __LINE__)(COMBINE(sTmStat, __LINE__));
#define RACTIVATE_TIMING() TimingInspector::Activate(true);
#define RDEACTIVATE_TIMING() TimingInspector::Activate(false);

1
uppsrc/Core/Util.cpp
View file

@ -430,6 +430,7 @@ String TextSettings::Get(const char *group, const char *key) const
// --------------------------------------------------------------
String timeFormat(double s) {
if(s < 0.000001) return Sprintf("%5.2f ns", s * 1.0e9);
if(s < 0.001) return Sprintf("%5.2f us", s * 1.0e6);
if(s < 1) return Sprintf("%5.2f ms", s * 1.0e3);
return Sprintf("%5.2f s ", s);