diff --git a/README.md b/README.md index e207d389..29e5a4ea 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ GoogleTest now follows the [Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support). -We recommend using the latest commit in the `master` branch in your projects. +We recommend using the latest commit in the `main` branch in your projects. #### Documentation Updates diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 852dd9b9..4d7b83ed 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -267,7 +267,7 @@ void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) { ExpectSpecProperty( last_clause_ < kTimes, ".Times() may only appear *before* .InSequence(), .WillOnce(), " - ".WillRepeatedly(), or .RetiresonSaturation(), not after."); + ".WillRepeatedly(), or .RetiresOnSaturation(), not after."); } last_clause_ = kTimes; diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index a34c1c9a..d47550ae 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -377,12 +377,12 @@ class MemoryIsNotDeallocated old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT // doesn't report mem leak if there's no matching deallocation. - _CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF); + (void)_CrtSetDbgFlag(old_crtdbg_flag_ & ~_CRTDBG_ALLOC_MEM_DF); } ~MemoryIsNotDeallocated() { // Restore the original _CRTDBG_ALLOC_MEM_DF flag - _CrtSetDbgFlag(old_crtdbg_flag_); + (void)_CrtSetDbgFlag(old_crtdbg_flag_); } private: