coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-21 02:54:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google:main' into master

Browse Source
This commit is contained in:
Anthony Graca 2021-11-18 18:52:03 -08:00 committed by GitHub
commit bed18f6b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -6,7 +6,7 @@
GoogleTest now follows the GoogleTest now follows the
[Abseil Live at Head philosophy](https://abseil.io/about/philosophy#upgrade-support). [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 #### Documentation Updates

2
googlemock/src/gmock-spec-builders.cc
View File

@ -267,7 +267,7 @@ void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) {
ExpectSpecProperty( ExpectSpecProperty(
last_clause_ < kTimes, last_clause_ < kTimes,
".Times() may only appear *before* .InSequence(), .WillOnce(), " ".Times() may only appear *before* .InSequence(), .WillOnce(), "
".WillRepeatedly(), or .RetiresonSaturation(), not after."); ".WillRepeatedly(), or .RetiresOnSaturation(), not after.");
} }
last_clause_ = kTimes; last_clause_ = kTimes;

4
googletest/src/gtest-port.cc
View File

@ -377,12 +377,12 @@ class MemoryIsNotDeallocated
old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
// Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT // Set heap allocation block type to _IGNORE_BLOCK so that MS debug CRT
// doesn't report mem leak if there's no matching deallocation. // 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() { ~MemoryIsNotDeallocated() {
// Restore the original _CRTDBG_ALLOC_MEM_DF flag // Restore the original _CRTDBG_ALLOC_MEM_DF flag
_CrtSetDbgFlag(old_crtdbg_flag_); (void)_CrtSetDbgFlag(old_crtdbg_flag_);
} }
private: private: