diff options
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 323ab25..78c4c90 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -2708,19 +2708,18 @@ class FloatingPointTest : public testing::Test { zero_bits_(Floating(0).bits()), one_bits_(Floating(1).bits()), infinity_bits_(Floating(Floating::Infinity()).bits()), - close_to_positive_zero_(ReinterpretBits(zero_bits_ + max_ulps_/2)), - close_to_negative_zero_(ReinterpretBits( - zero_bits_ + max_ulps_ - max_ulps_/2)), - further_from_negative_zero_(-ReinterpretBits( + close_to_positive_zero_(AsBits(zero_bits_ + max_ulps_/2)), + close_to_negative_zero_(AsBits(zero_bits_ + max_ulps_ - max_ulps_/2)), + further_from_negative_zero_(-AsBits( zero_bits_ + max_ulps_ + 1 - max_ulps_/2)), - close_to_one_(ReinterpretBits(one_bits_ + max_ulps_)), - further_from_one_(ReinterpretBits(one_bits_ + max_ulps_ + 1)), + close_to_one_(AsBits(one_bits_ + max_ulps_)), + further_from_one_(AsBits(one_bits_ + max_ulps_ + 1)), infinity_(Floating::Infinity()), - close_to_infinity_(ReinterpretBits(infinity_bits_ - max_ulps_)), - further_from_infinity_(ReinterpretBits(infinity_bits_ - max_ulps_ - 1)), + close_to_infinity_(AsBits(infinity_bits_ - max_ulps_)), + further_from_infinity_(AsBits(infinity_bits_ - max_ulps_ - 1)), max_(Floating::Max()), - nan1_(Floating::ReinterpretBits(Floating::kExponentBitMask | 1)), - nan2_(Floating::ReinterpretBits(Floating::kExponentBitMask | 200)) { + nan1_(AsBits(Floating::kExponentBitMask | 1)), + nan2_(AsBits(Floating::kExponentBitMask | 200)) { } void TestSize() { @@ -2804,7 +2803,7 @@ class FloatingPointTest : public testing::Test { private: template <typename T> - static RawType ReinterpretBits(T value) { + static RawType AsBits(T value) { return Floating::ReinterpretBits(static_cast<Bits>(value)); } }; |