Merge pull request #3262 from platisd:master

PiperOrigin-RevId: 356568444

googlemock/scripts/generator/cpp/gmock_class.py

@@ -132,6 +132,7 @@ def _GenerateMethods(output_lines, source, class_node):
       args = []
       for p in node.parameters:
         arg = _GenerateArg(source[p.start:p.end])
+        if arg != 'void':
           args.append(_EscapeForMacro(arg))
 
       # Create the mock method definition.

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):