@@ -101,8 +101,6 @@ TEST(RooNaNPacker, CanPackStuffIntoNaNs)
101101 dumpFloats (rnp._payload );
102102}
103103
104- #if !defined(_MSC_VER) || defined(_WIN64) || defined(NDEBUG) || defined(R__ENABLE_BROKEN_WIN_TESTS)
105-
106104// Demonstrate value preserving behavior after arithmetic on packed NaNs.
107105TEST (RooNaNPacker, PackedNaNPreservedAfterArithmetic)
108106{
@@ -145,10 +143,6 @@ TEST(RooNaNPacker, PackedNaNPreservedAfterArithmetic)
145143 // PackedNaN pays no mind
146144 EXPECT_EQ (rnp.getPayload (), rnp2.getPayload ());
147145
148- // the following tests have compiler dependent behavior
149- // (note that this behavior was tested for msvc as well, even though this
150- // whole test is currently disabled in msvc)
151- #if defined(__clang__) || defined(_MSC_VER)
152146 // add packed NaN to regular NaN
153147 rnp2._payload = std::numeric_limits<double >::quiet_NaN () + rnp.getNaNWithPayload ();
154148 // first NaN wins, though! now the payload is gone
@@ -174,27 +168,8 @@ TEST(RooNaNPacker, PackedNaNPreservedAfterArithmetic)
174168 EXPECT_FALSE (rnp2.isNaNWithPayload ());
175169 // a quiet NaN has a "payload" of zero
176170 EXPECT_EQ (0 , rnp2.getPayload ());
177- #endif // defined(__clang__) || defined(_MSC_VER)
178- #if defined(__GNUC__) && !defined(__clang__)
179- // on gcc, a different NaN is preserved than in clang and msvc!
180-
181- // add packed NaN to regular NaN
182- rnp2._payload = rnp.getNaNWithPayload () + std::numeric_limits<double >::quiet_NaN ();
183- // on gcc, the second NaN wins! now the payload is gone
184- EXPECT_FALSE (rnp2.isNaNWithPayload ());
185- // a quiet NaN has a "payload" of zero
186- EXPECT_EQ (0 , rnp2.getPayload ());
187-
188- // ... other way around
189- rnp2._payload = std::numeric_limits<double >::quiet_NaN () + rnp.getNaNWithPayload ();
190- EXPECT_TRUE (rnp2.isNaNWithPayload ());
191- // if it comes second, the PackedNaN does survive
192- EXPECT_EQ (rnp.getPayload (), rnp2.getPayload ());
193- #endif // __GNUC__
194171}
195172
196- #endif // !defined(_MSC_VER) || defined(R__ENABLE_BROKEN_WIN_TESTS)
197-
198173// / Fit a simple linear function, that starts in the negative.
199174TEST (RooNaNPacker, FitSimpleLinear)
200175{
0 commit comments