summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-11-22 21:33:23 (GMT)
committerGennadiy Civil <misterg@google.com>2019-11-22 21:33:23 (GMT)
commitaf71b6607f9e63a0c70b59dcafe92a42a57e3a96 (patch)
treec83364089bff467d79b9cb5b026fcb3ed7b60420
parent717ce7feb87278b81dad756d973693024621f8e8 (diff)
parentdcdb65065f41aad2b706a945108f9d02b381a392 (diff)
downloadgoogletest-af71b6607f9e63a0c70b59dcafe92a42a57e3a96.zip
googletest-af71b6607f9e63a0c70b59dcafe92a42a57e3a96.tar.gz
googletest-af71b6607f9e63a0c70b59dcafe92a42a57e3a96.tar.bz2
Merge pull request #2570 from xieyubo:1.10
PiperOrigin-RevId: 281971090
-rw-r--r--googletest/src/gtest-port.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc
index c6df26d..a05c50a 100644
--- a/googletest/src/gtest-port.cc
+++ b/googletest/src/gtest-port.cc
@@ -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 =