diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-10-25 11:11:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 16:12:46 -0400 |
| commit | c80c5fa512185d1c24c5c13f03a04326f9d0cc50 (patch) | |
| tree | 0b01316b3307e6433627741c77238f20e37ff37d | |
| parent | daeeab36eb2684e74f978cb083a2e6535370896d (diff) | |
DRTVWR-476: Explicitly cast 64-bit NaN constant to F32 as needed.
VS 2017 was complaining about truncating the value.
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.cpp | 4 | ||||
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llcommon/lltraceaccumulators.cpp b/indra/llcommon/lltraceaccumulators.cpp index 385d31edd7..b1c23c6fb7 100644 --- a/indra/llcommon/lltraceaccumulators.cpp +++ b/indra/llcommon/lltraceaccumulators.cpp @@ -291,8 +291,8 @@ void EventAccumulator::reset( const EventAccumulator* other ) { mNumSamples = 0; mSum = 0; - mMin = NaN; - mMax = NaN; + mMin = F32(NaN); + mMax = F32(NaN); mMean = NaN; mSumOfSquares = 0; mLastValue = other ? other->mLastValue : NaN; diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h index 6f27b97dff..8eb5338a2a 100644 --- a/indra/llcommon/lltraceaccumulators.h +++ b/indra/llcommon/lltraceaccumulators.h @@ -242,8 +242,8 @@ namespace LLTrace EventAccumulator() : mSum(0), - mMin(NaN), - mMax(NaN), + mMin(F32(NaN)), + mMax(F32(NaN)), mMean(NaN), mSumOfSquares(0), mNumSamples(0), @@ -313,8 +313,8 @@ namespace LLTrace SampleAccumulator() : mSum(0), - mMin(NaN), - mMax(NaN), + mMin(F32(NaN)), + mMax(F32(NaN)), mMean(NaN), mSumOfSquares(0), mLastSampleTimeStamp(0), |