3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-10 17:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small style changes.

Browse Source 
Just small style changes and we can accept this PR
This commit is contained in:
Gennadiy Civil 2018-08-16 13:18:13 -04:00 committed by GitHub
parent f3a9fa6a62
commit c38f4b9f2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,7 @@ namespace {
// //
class MemoryIsNotDeallocated class MemoryIsNotDeallocated
{ {
public: public:
MemoryIsNotDeallocated() : old_crtdbg_flag_(0) { MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
#ifdef _MSC_VER #ifdef _MSC_VER
old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
@ -323,7 +323,7 @@ public:
#endif // _MSC_VER #endif // _MSC_VER
} }
private: private:
int old_crtdbg_flag_; int old_crtdbg_flag_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated); GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
@ -584,17 +584,11 @@ class ThreadLocalRegistryImpl {
return 0; return 0;
} }
// Return a newly constructed ThreadIdToThreadLocals that's intentionally never deleted
static ThreadIdToThreadLocals* NewThreadIdToThreadLocals() {
// Use RAII to flag that following mem alloc is never deallocated.
MemoryIsNotDeallocated memory_is_not_deallocated;
return new ThreadIdToThreadLocals;
}
// Returns map of thread local instances. // Returns map of thread local instances.
static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() { static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
mutex_.AssertHeld(); mutex_.AssertHeld();
static ThreadIdToThreadLocals* map = NewThreadIdToThreadLocals(); MemoryIsNotDeallocated memory_is_not_deallocated;
static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
return map; return map;
} }