Skip to content

GitLab

Commit af71b660 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

Merge pull request #2570 from xieyubo:1.10 

PiperOrigin-RevId: 281971090
parents 717ce7fe dcdb6506
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
googletest/src/gtest-port.cc
View file @ af71b660
......@@ -537,6 +537,9 @@ class ThreadLocalRegistryImpl {
// Returns a value that can be used to identify the thread from other threads.
static ThreadLocalValueHolderBase* GetValueOnCurrentThread(
const ThreadLocalBase* thread_local_instance) {
#ifdef _MSC_VER
MemoryIsNotDeallocated memory_is_not_deallocated;
#endif // _MSC_VER
DWORD current_thread = ::GetCurrentThreadId();
MutexLock lock(&mutex_);
ThreadIdToThreadLocals* const thread_to_thread_locals =
......
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