diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-04-15 10:14:33 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2016-04-15 10:14:33 -0400 |
| commit | 594fb229365a55a8414238c70555aaf6dca46813 (patch) | |
| tree | 0ca0b22b7076794a84eede4816f2258f7235ede3 /src/third_party | |
| parent | 5b177d096afbf77d322cbdbba5b9b5db075ca92c (diff) | |
| download | mongo-594fb229365a55a8414238c70555aaf6dca46813.tar.gz | |
SERVER-23736 Boost 1.60.0 avoid boost TLS assertion at process shutdown
Ported from Boost 1.56.0 commit 27bd602a6e6ba29978a6468442a196731ecf14a0
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/boost-1.60.0/libs/thread/src/win32/thread.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/third_party/boost-1.60.0/libs/thread/src/win32/thread.cpp b/src/third_party/boost-1.60.0/libs/thread/src/win32/thread.cpp index 972b73105f5..824b60a2479 100644 --- a/src/third_party/boost-1.60.0/libs/thread/src/win32/thread.cpp +++ b/src/third_party/boost-1.60.0/libs/thread/src/win32/thread.cpp @@ -116,7 +116,10 @@ namespace boost } else { - BOOST_VERIFY(false); + // If we attempted to set the data to a null pointer, don't flag an error. + // This happens at shutdown, where boost has a race between thread and + // process exit handlers. + BOOST_VERIFY(!new_data); //boost::throw_exception(thread_resource_error()); } #endif |