Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
d166e094
Commit
d166e094
authored
Dec 16, 2019
by
CJ Johnson
Browse files
Merge pull request #2590 from kuzkry:remove-workaround_g++-stale-comments
PiperOrigin-RevId: 285812343
parents
0a0c8266
a91e4e73
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
googletest/test/gtest_unittest.cc
googletest/test/gtest_unittest.cc
+0
-12
No files found.
googletest/test/gtest_unittest.cc
View file @
d166e094
...
@@ -3075,8 +3075,6 @@ TEST_F(DoubleTest, EXPECT_NEAR) {
...
@@ -3075,8 +3075,6 @@ TEST_F(DoubleTest, EXPECT_NEAR) {
EXPECT_NONFATAL_FAILURE
(
EXPECT_NEAR
(
1.0
,
1.5
,
0.25
),
// NOLINT
EXPECT_NONFATAL_FAILURE
(
EXPECT_NEAR
(
1.0
,
1.5
,
0.25
),
// NOLINT
"The difference between 1.0 and 1.5 is 0.5, "
"The difference between 1.0 and 1.5 is 0.5, "
"which exceeds 0.25"
);
"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.
// Tests ASSERT_NEAR.
...
@@ -3086,8 +3084,6 @@ TEST_F(DoubleTest, ASSERT_NEAR) {
...
@@ -3086,8 +3084,6 @@ TEST_F(DoubleTest, ASSERT_NEAR) {
EXPECT_FATAL_FAILURE
(
ASSERT_NEAR
(
1.0
,
1.5
,
0.25
),
// NOLINT
EXPECT_FATAL_FAILURE
(
ASSERT_NEAR
(
1.0
,
1.5
,
0.25
),
// NOLINT
"The difference between 1.0 and 1.5 is 0.5, "
"The difference between 1.0 and 1.5 is 0.5, "
"which exceeds 0.25"
);
"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.
// Tests the cases where DoubleLE() should succeed.
...
@@ -3732,10 +3728,6 @@ TEST(AssertionTest, ASSERT_EQ) {
...
@@ -3732,10 +3728,6 @@ TEST(AssertionTest, ASSERT_EQ) {
TEST
(
AssertionTest
,
ASSERT_EQ_NULL
)
{
TEST
(
AssertionTest
,
ASSERT_EQ_NULL
)
{
// A success.
// A success.
const
char
*
p
=
nullptr
;
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
);
ASSERT_EQ
(
nullptr
,
p
);
// A failure.
// A failure.
...
@@ -4459,10 +4451,6 @@ TEST(ExpectTest, EXPECT_EQ_Double) {
...
@@ -4459,10 +4451,6 @@ TEST(ExpectTest, EXPECT_EQ_Double) {
TEST
(
ExpectTest
,
EXPECT_EQ_NULL
)
{
TEST
(
ExpectTest
,
EXPECT_EQ_NULL
)
{
// A success.
// A success.
const
char
*
p
=
nullptr
;
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
);
EXPECT_EQ
(
nullptr
,
p
);
// A failure.
// A failure.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment