Merge pull request #2041 from ciband:chore/fix_library_json

PiperOrigin-RevId: 230554814
2019-01-23 13:27:15 -05:00
parent fdc59ffd05 45c58aa6f3
commit bf07131c1d
9 changed files with 68 additions and 16 deletions
--- a/googlemock/include/gmock/gmock.h
+++ b/googlemock/include/gmock/gmock.h
@@ -92,6 +92,10 @@ GTEST_API_ void InitGoogleMock(int* argc, char** argv);
 // UNICODE mode.
 GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv);

+// This overloaded version can be used on Arduino/embedded platforms where
+// there is no argc/argv.
+GTEST_API_ void InitGoogleMock();
+
 }  // namespace testing

 #endif  // GMOCK_INCLUDE_GMOCK_GMOCK_H_