diff options
| author | Andy Soffer <asoffer@google.com> | 2021-02-11 17:49:08 (GMT) |
|---|---|---|
| committer | Andy Soffer <asoffer@google.com> | 2021-02-11 17:49:08 (GMT) |
| commit | e165773418cf4977ddeb6345db6c5c3e5c0d3a2b (patch) | |
| tree | 46ba7fc48accea1027011f5503cf9ceb5c598409 /googlemock | |
| parent | af058521adb3a12c0e2d69a219f81a133b244ee6 (diff) | |
| parent | 46b188577b9478215d8cf8ea2bde5e4946844f1f (diff) | |
| download | googletest-e165773418cf4977ddeb6345db6c5c3e5c0d3a2b.zip googletest-e165773418cf4977ddeb6345db6c5c3e5c0d3a2b.tar.gz googletest-e165773418cf4977ddeb6345db6c5c3e5c0d3a2b.tar.bz2 | |
Merge pull request #3262 from platisd:master
PiperOrigin-RevId: 356568444
Diffstat (limited to 'googlemock')
| -rwxr-xr-x | googlemock/scripts/generator/cpp/gmock_class.py | 3 | ||||
| -rwxr-xr-x | googlemock/scripts/generator/cpp/gmock_class_test.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/googlemock/scripts/generator/cpp/gmock_class.py b/googlemock/scripts/generator/cpp/gmock_class.py index c4d2793..3e21022 100755 --- a/googlemock/scripts/generator/cpp/gmock_class.py +++ b/googlemock/scripts/generator/cpp/gmock_class.py @@ -132,7 +132,8 @@ def _GenerateMethods(output_lines, source, class_node): args = [] for p in node.parameters: arg = _GenerateArg(source[p.start:p.end]) - args.append(_EscapeForMacro(arg)) + if arg != 'void': + args.append(_EscapeForMacro(arg)) # Create the mock method definition. output_lines.extend([ diff --git a/googlemock/scripts/generator/cpp/gmock_class_test.py b/googlemock/scripts/generator/cpp/gmock_class_test.py index 7d5e2f1..eff475f 100755 --- a/googlemock/scripts/generator/cpp/gmock_class_test.py +++ b/googlemock/scripts/generator/cpp/gmock_class_test.py @@ -156,7 +156,7 @@ class Foo { }; """ self.assertEqualIgnoreLeadingWhitespace( - 'MOCK_METHOD(int, Bar, (void), (override));', + 'MOCK_METHOD(int, Bar, (), (override));', self.GenerateMethodSource(source)) def testStrangeNewlineInParameter(self): |