Skip to content

Commit

Permalink
Merge pull request #2590 from kuzkry:remove-workaround_g++-stale-comm…
Browse files Browse the repository at this point in the history
…ents

PiperOrigin-RevId: 285812343
  • Loading branch information
CJ-Johnson committed Dec 16, 2019
2 parents 0a0c826 + a91e4e7 commit d166e09
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions googletest/test/gtest_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3075,8 +3075,6 @@ TEST_F(DoubleTest, EXPECT_NEAR) {
EXPECT_NONFATAL_FAILURE(EXPECT_NEAR(1.0, 1.5, 0.25), // NOLINT
"The difference between 1.0 and 1.5 is 0.5, "
"which exceeds 0.25");
// To work around a bug in gcc 2.95.0, there is intentionally no
// space after the first comma in the previous statement.
}

// Tests ASSERT_NEAR.
Expand All @@ -3086,8 +3084,6 @@ TEST_F(DoubleTest, ASSERT_NEAR) {
EXPECT_FATAL_FAILURE(ASSERT_NEAR(1.0, 1.5, 0.25), // NOLINT
"The difference between 1.0 and 1.5 is 0.5, "
"which exceeds 0.25");
// To work around a bug in gcc 2.95.0, there is intentionally no
// space after the first comma in the previous statement.
}

// Tests the cases where DoubleLE() should succeed.
Expand Down Expand Up @@ -3732,10 +3728,6 @@ TEST(AssertionTest, ASSERT_EQ) {
TEST(AssertionTest, ASSERT_EQ_NULL) {
// A success.
const char* p = nullptr;
// Some older GCC versions may issue a spurious warning in this or the next
// assertion statement. This warning should not be suppressed with
// static_cast since the test verifies the ability to use bare NULL as the
// expected parameter to the macro.
ASSERT_EQ(nullptr, p);

// A failure.
Expand Down Expand Up @@ -4459,10 +4451,6 @@ TEST(ExpectTest, EXPECT_EQ_Double) {
TEST(ExpectTest, EXPECT_EQ_NULL) {
// A success.
const char* p = nullptr;
// Some older GCC versions may issue a spurious warning in this or the next
// assertion statement. This warning should not be suppressed with
// static_cast since the test verifies the ability to use bare NULL as the
// expected parameter to the macro.
EXPECT_EQ(nullptr, p);

// A failure.
Expand Down

0 comments on commit d166e09

Please sign in to comment.