diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-06 18:02:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 18:02:42 -0700 |
| commit | 886a74769e616665198114f6b9151bd6f629f521 (patch) | |
| tree | 2a70e31d70f4920cc164fd9400725a263d796acf | |
| parent | 5d2e503574703da547390fe715df771cd4bf763a (diff) | |
| parent | 28b71e444c41ad93225145e029db4957f15aaae6 (diff) | |
| download | googletest-886a74769e616665198114f6b9151bd6f629f521.tar.gz googletest-886a74769e616665198114f6b9151bd6f629f521.tar.bz2 googletest-886a74769e616665198114f6b9151bd6f629f521.zip | |
Merge branch 'master' into suppressDefault
| -rw-r--r-- | googlemock/test/gmock-actions_test.cc | 2 | ||||
| -rw-r--r-- | googletest/test/googletest-printers-test.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/googlemock/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc index e8bdbee7..2d169f88 100644 --- a/googlemock/test/gmock-actions_test.cc +++ b/googlemock/test/gmock-actions_test.cc @@ -937,6 +937,8 @@ class Foo { int value_; }; +// GOOGLETEST_CM0005 DO NOT DELETE + // Tests InvokeWithoutArgs(function). TEST(InvokeWithoutArgsTest, Function) { // As an action that takes one argument. diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc index 49b3bd46..1b1026e7 100644 --- a/googletest/test/googletest-printers-test.cc +++ b/googletest/test/googletest-printers-test.cc @@ -572,7 +572,7 @@ struct Foo { TEST(PrintPointerTest, MemberVariablePointer) { EXPECT_TRUE(HasPrefix(Print(&Foo::value), Print(sizeof(&Foo::value)) + "-byte object ")); - int (Foo::*p) = NULL; // NOLINT + int Foo::*p = NULL; // NOLINT EXPECT_TRUE(HasPrefix(Print(p), Print(sizeof(p)) + "-byte object ")); } @@ -1250,7 +1250,7 @@ TEST(PrintReferenceTest, HandlesMemberFunctionPointer) { // Tests that the universal printer prints a member variable pointer // passed by reference. TEST(PrintReferenceTest, HandlesMemberVariablePointer) { - int (Foo::*p) = &Foo::value; // NOLINT + int Foo::*p = &Foo::value; // NOLINT EXPECT_TRUE(HasPrefix( PrintByRef(p), "@" + PrintPointer(&p) + " " + Print(sizeof(p)) + "-byte object ")); |