From dfc367536138883d23b10c13205d962c96af3f2b Mon Sep 17 00:00:00 2001 From: Krystian Kuzniarek Date: Tue, 16 Nov 2021 09:18:03 +0100 Subject: [PATCH 1/4] fix a typo --- googlemock/src/gmock-spec-builders.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 8f8d7f9b..7b4a38bd 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; From 6e271e4aeae50cbeb4f720998ffbc230482bc90a Mon Sep 17 00:00:00 2001 From: assafpr <93249401+assafpr@users.noreply.github.com> Date: Tue, 16 Nov 2021 13:32:51 +0200 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ca2952c5efa4f8227a3c47f9d719e36442daa2ad Mon Sep 17 00:00:00 2001 From: assafpr <93249401+assafpr@users.noreply.github.com> Date: Tue, 16 Nov 2021 13:33:26 +0200 Subject: [PATCH 3/4] fixed branch from master to main in readme.md From 035a101b62b144655d771c3a252e4cd52bde19a2 Mon Sep 17 00:00:00 2001 From: Denis Samoilov Date: Tue, 16 Nov 2021 18:59:03 -0800 Subject: [PATCH 4/4] Suppress unused-value warning When _DEBUG is not defined the _CrtSetDbgFlag turns into ((int)0), which causes unused-value warning for clang. --- googletest/src/gtest-port.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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: