From c80c5fa512185d1c24c5c13f03a04326f9d0cc50 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 25 Oct 2018 11:11:22 -0400
Subject: [PATCH] DRTVWR-476: Explicitly cast 64-bit NaN constant to F32 as
needed.
VS 2017 was complaining about truncating the value.
---
indra/llcommon/lltraceaccumulators.cpp | 4 ++--
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 385d31edd7b..b1c23c6fb7a 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 6f27b97dff9..8eb5338a2a9 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),
--
GitLab