diff options
author | Abseil Team <absl-team@google.com> | 2019-03-04 14:38:02 (GMT) |
---|---|---|
committer | Gennadiy Civil <misterg@google.com> | 2019-03-05 13:39:28 (GMT) |
commit | a1dd07786b9a780a10be9dd643096b28f5a266d2 (patch) | |
tree | 89a3169a4b5bdad487e923b70b7cbeb1fbf82788 | |
parent | db9b85e27522628ef173149a692031b7f2154b55 (diff) | |
download | googletest-a1dd07786b9a780a10be9dd643096b28f5a266d2.zip googletest-a1dd07786b9a780a10be9dd643096b28f5a266d2.tar.gz googletest-a1dd07786b9a780a10be9dd643096b28f5a266d2.tar.bz2 |
Googletest export
Build gmock cleanly with clang -Wextra-semi and -Wextra-semi-stmt
Extends 56ef07a20308 to take -Wc++98-compat-extra-semi
(https://reviews.llvm.org/D43162) and -Wextra-semi-stmt
(https://reviews.llvm.org/D52695) into account.
For https://crbug.com/926235.
PiperOrigin-RevId: 236643095
-rw-r--r-- | googlemock/test/gmock-internal-utils_test.cc | 4 | ||||
-rw-r--r-- | googletest/src/gtest.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc index 0adcdfb..75dd808 100644 --- a/googlemock/test/gmock-internal-utils_test.cc +++ b/googlemock/test/gmock-internal-utils_test.cc @@ -558,7 +558,7 @@ void ExpectCallLogger() { DummyMock mock; EXPECT_CALL(mock, TestMethod()); mock.TestMethod(); -}; +} // Verifies that EXPECT_CALL logs if the --gmock_verbose flag is set to "info". TEST(ExpectCallTest, LogsWhenVerbosityIsInfo) { @@ -581,7 +581,7 @@ TEST(ExpectCallTest, DoesNotLogWhenVerbosityIsError) { void OnCallLogger() { DummyMock mock; ON_CALL(mock, TestMethod()); -}; +} // Verifies that ON_CALL logs if the --gmock_verbose flag is set to "info". TEST(OnCallTest, LogsWhenVerbosityIsInfo) { diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 1d41692..c6bb91d 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2970,7 +2970,7 @@ static const char* GetAnsiColorCode(GTestColor color) { case COLOR_YELLOW: return "3"; default: return nullptr; - }; + } } #endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE |