Skip to content

GitLab

Commit a0dc888b authored by Copybara-Service's avatar Copybara-Service
Browse files

Merge pull request #3672 from densamoilov:densamoilov/main/suppress-warning 

PiperOrigin-RevId: 410816204
Change-Id: Ib4c4851ae4e8a612d60184f53cd565c75671c4c6
parents 1a3e2a26 035a101b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
googletest/src/gtest-port.cc
View file @ a0dc888b
...@@ -377,12 +377,12 @@ class MemoryIsNotDeallocated ...@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment