From da1ea2c8b915a73e08e48f8b5e8c0a9e8cf0b46c Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Tue, 27 Feb 2018 07:54:49 -0800 Subject: [PATCH] Rename Interval::warning's parameters to avoid shadowing GCC 4.9 warns about this, causing build failures with -Werror Change-Id: Ic3579de84f4b3f1f231240910dbd15dafe90c6bc Components: Framework --- framework/common/tcuInterval.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/common/tcuInterval.hpp b/framework/common/tcuInterval.hpp index bbbdf3e..57025ac 100644 --- a/framework/common/tcuInterval.hpp +++ b/framework/common/tcuInterval.hpp @@ -99,10 +99,10 @@ public: bool isFinite (void) const { return m_lo > -TCU_INFINITY && m_hi < TCU_INFINITY; } bool isOrdinary (void) const { return !hasNaN() && !empty() && isFinite(); } - void warning (double lo, double hi) + void warning (double lo_, double hi_) { - m_warningLo = lo; - m_warningHi = hi; + m_warningLo = lo_; + m_warningHi = hi_; } Interval operator| (const Interval& other) const -- 2.7.4