summaryrefslogtreecommitdiff
path: root/indra/llcommon/lltraceaccumulators.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-14 16:10:17 -0700
committerRichard Linden <none@none>2013-08-14 16:10:17 -0700
commitbceb1e8abe916cd69e7ac6ab70dc03dc6d76c9df (patch)
tree0016163049097d6b55a065b8fafdc609f1879c54 /indra/llcommon/lltraceaccumulators.h
parent52086d4485e004999d097cb66fb5cf63e34203d2 (diff)
parent26581404e426b00cd0a07c38b5cb858d5d5faa28 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llcommon/lltraceaccumulators.h')
-rw-r--r--indra/llcommon/lltraceaccumulators.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index ef73bd3091..4d79964526 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -418,7 +418,7 @@ namespace LLTrace
class TimeBlockAccumulator
{
public:
- typedef LLUnit<F64, LLUnits::Seconds> value_t;
+ typedef LLUnits::F64Seconds value_t;
typedef TimeBlockAccumulator self_t;
// fake classes that allows us to view different facets of underlying statistic
@@ -429,7 +429,7 @@ namespace LLTrace
struct SelfTimeFacet
{
- typedef LLUnit<F64, LLUnits::Seconds> value_t;
+ typedef LLUnits::F64Seconds value_t;
};
TimeBlockAccumulator();