diff options
| author | Abseil Team <absl-team@google.com> | 2019-02-27 02:15:41 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-03-01 21:18:17 (GMT) |
| commit | 56ef07a20308b57f940936c6979f5d6d3837d8c6 (patch) | |
| tree | 3f3c2e1e00f37d5982ebdbe572fc8aa73b5be13c /googlemock | |
| parent | efecb0bfa687cf87836494f5d62868485c00fb66 (diff) | |
| download | googletest-56ef07a20308b57f940936c6979f5d6d3837d8c6.zip googletest-56ef07a20308b57f940936c6979f5d6d3837d8c6.tar.gz googletest-56ef07a20308b57f940936c6979f5d6d3837d8c6.tar.bz2 | |
Googletest export
Build gmock cleanly with clang -Wextra-semi
For https://crbug.com/926235.
From https://github.com/google/googletest/pull/2139.
Fixes https://github.com/google/googletest/issues/2138.
PiperOrigin-RevId: 235832527
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-function-mocker.h | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-function-mocker_test.cc | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-generated-function-mockers_test.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-function-mocker.h b/googlemock/include/gmock/gmock-function-mocker.h index 3d14204..84a608e 100644 --- a/googlemock/include/gmock/gmock-function-mocker.h +++ b/googlemock/include/gmock/gmock-function-mocker.h @@ -21,7 +21,7 @@ GMOCK_INTERNAL_ASSERT_PARENTHESIS(_Spec); \ GMOCK_INTERNAL_ASSERT_VALID_SIGNATURE( \ GMOCK_PP_NARG0 _Args, GMOCK_INTERNAL_SIGNATURE(_Ret, _Args)); \ - GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec); \ + GMOCK_INTERNAL_ASSERT_VALID_SPEC(_Spec) \ GMOCK_INTERNAL_MOCK_METHOD_IMPL( \ GMOCK_PP_NARG0 _Args, _MethodName, GMOCK_INTERNAL_HAS_CONST(_Spec), \ GMOCK_INTERNAL_HAS_OVERRIDE(_Spec), GMOCK_INTERNAL_HAS_FINAL(_Spec), \ diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc index d16006f..fbc5d5b 100644 --- a/googlemock/test/gmock-function-mocker_test.cc +++ b/googlemock/test/gmock-function-mocker_test.cc @@ -536,7 +536,7 @@ TEST(MockMethodOverloadedMockMethodTest, CanOverloadOnArgNumberInMacroBody) { #define MY_MOCK_METHODS2_ \ MOCK_CONST_METHOD1(Overloaded, int(int n)); \ - MOCK_METHOD1(Overloaded, int(int n)); + MOCK_METHOD1(Overloaded, int(int n)) class MockOverloadedOnConstness { public: diff --git a/googlemock/test/gmock-generated-function-mockers_test.cc b/googlemock/test/gmock-generated-function-mockers_test.cc index f07226c..dff3a9f 100644 --- a/googlemock/test/gmock-generated-function-mockers_test.cc +++ b/googlemock/test/gmock-generated-function-mockers_test.cc @@ -535,7 +535,7 @@ TEST(OverloadedMockMethodTest, CanOverloadOnArgNumberInMacroBody) { #define MY_MOCK_METHODS2_ \ MOCK_CONST_METHOD1(Overloaded, int(int n)); \ - MOCK_METHOD1(Overloaded, int(int n)); + MOCK_METHOD1(Overloaded, int(int n)) class MockOverloadedOnConstness { public: |