Improvements to sample verification code

[platform/upstream/VK-GL-CTS.git] / framework / common / tcuInterval.hpp

diff --git a/framework/common/tcuInterval.hpp b/framework/common/tcuInterval.hpp
index 0c29d57..cc271a1 100644 (file)
--- a/framework/common/tcuInterval.hpp
+++ b/framework/common/tcuInterval.hpp
@@ -70,6 +70,9 @@ public:
                                        , m_lo          (m_hasNaN ? TCU_INFINITY : val)
                                        , m_hi          (m_hasNaN ? -TCU_INFINITY : val) {}
 
+                               Interval                (bool hasNaN_, double lo_, double hi_)
+                                       : m_hasNaN(hasNaN_), m_lo(lo_), m_hi(hi_) {}
+
                                Interval                (const Interval& a, const Interval& b)
                                        : m_hasNaN      (a.m_hasNaN || b.m_hasNaN)
                                        , m_lo          (de::min(a.lo(), b.lo()))
@@ -145,8 +148,6 @@ public:
        }
 
 private:
-                               Interval                (bool hasNaN_, double lo_, double hi_)
-                                       : m_hasNaN(hasNaN_), m_lo(lo_), m_hi(hi_) {}
        bool            m_hasNaN;
        double          m_lo;
        double          m_hi;
@@ -179,12 +180,12 @@ std::ostream&     operator<<      (std::ostream& os, const Interval& interval);
        ::tcu::Interval                         VAR##_hi_;                                              \
                                                                                                                                \
        {                                                                                                                       \
-               ::tcu::Interval&        VAR     = VAR##_lo_;                                    \
+               ::tcu::Interval&        (VAR) = VAR##_lo_;                                      \
                ::deSetRoundingMode(DE_ROUNDINGMODE_TO_NEGATIVE_INF);   \
                SETLOW;                                                                                                 \
        }                                                                                                                       \
        {                                                                                                                       \
-               ::tcu::Interval&        VAR     = VAR##_hi_;                                    \
+               ::tcu::Interval&        (VAR) = VAR##_hi_;                                      \
                ::deSetRoundingMode(DE_ROUNDINGMODE_TO_POSITIVE_INF);   \
                SETHIGH;                                                                                                \
        }                                                                                                                       \
@@ -211,13 +212,13 @@ std::ostream&     operator<<      (std::ostream& os, const Interval& interval);
        else                                                                                                                            \
        {                                                                                                                                       \
                {                                                                                                                               \
-                       const double            PARAM   = VAR##_arg_.lo();                              \
-                       ::tcu::Interval&        VAR             = VAR##_lo_;                                    \
+                       const double            (PARAM) = VAR##_arg_.lo();                              \
+                       ::tcu::Interval&        (VAR)   = VAR##_lo_;                                    \
                        BODY;                                                                                                           \
                }                                                                                                                               \
                {                                                                                                                               \
-                       const double            PARAM   = VAR##_arg_.hi();                              \
-                       ::tcu::Interval&        VAR             = VAR##_hi_;                                    \
+                       const double            (PARAM) = VAR##_arg_.hi();                              \
+                       ::tcu::Interval&        (VAR)   = VAR##_hi_;                                    \
                        BODY;                                                                                                           \
                }                                                                                                                               \
                VAR##_dst_ = VAR##_lo_ | VAR##_hi_;                                                             \