Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/googletest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 86495714f700
Choose a base ref
...
head repository: mockingbirdnest/googletest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dccc04dc9d56
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on May 22, 2021

  1. Make the main cdecl.

    pleroy committed May 22, 2021
    Copy the full SHA
    5d8f5e1 View commit details
  2. Copy the full SHA
    dccc04d View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 googlemock/src/gmock_main.cc
  2. +1 −1 googlemock/test/gmock-spec-builders_test.cc
  3. +1 −1 googletest/src/gtest_main.cc
2 changes: 1 addition & 1 deletion googlemock/src/gmock_main.cc
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ void loop() { RUN_ALL_TESTS(); }

GTEST_API_ int _tmain(int argc, TCHAR** argv) {
#else
GTEST_API_ int main(int argc, char** argv) {
GTEST_API_ int __cdecl main(int argc, char** argv) {
#endif // GTEST_OS_WINDOWS_MOBILE
std::cout << "Running main() from gmock_main.cc\n";
google::InitGoogleLogging(argv[0]);
2 changes: 1 addition & 1 deletion googlemock/test/gmock-spec-builders_test.cc
Original file line number Diff line number Diff line change
@@ -2763,7 +2763,7 @@ TEST(ParameterlessExpectationsTest,
#if GMOCK_RENAME_MAIN
int gmock_main(int argc, char **argv) {
#else
int main(int argc, char **argv) {
int __cdecl main(int argc, char **argv) {
#endif // GMOCK_RENAME_MAIN
testing::InitGoogleMock(&argc, argv);
// Ensures that the tests pass no matter what value of
2 changes: 1 addition & 1 deletion googletest/src/gtest_main.cc
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ void loop() { RUN_ALL_TESTS(); }

#else

GTEST_API_ int main(int argc, char **argv) {
GTEST_API_ int __cdecl main(int argc, char **argv) {
printf("Running main() from %s\n", __FILE__);
testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();