diff options
| author |  Abseil Team <absl-team@google.com> | 2017-11-13 10:04:29 -0800 |
|---|---|---|
| committer |  John Olson <jolson@google.com> | 2017-11-13 16:52:47 -0500 |
| commit | 95ddf85f8075d5645a754bac5742b72ec9c81f2a (patch) | |
| tree | 71008ea1f200d829507e651f49a5fdb6d92cf1c2 /absl/synchronization | |
| parent | 9e94e488f5006172245b2f977ab207ee140aca43 (diff) | |
Changes imported from Abseil "staging" branch:
- 5677afe8f626bb9db6d8bf9f25ba3d835ffa12d6 Internal TSAN bookkeeping change. by Greg Falcon <gfalcon@google.com>
- c7492bad6fe6c8f106d3fcb1f8a939ea73b1a962 MSVC fix. by Alex Strelnikov <strel@google.com>
GitOrigin-RevId: 5677afe8f626bb9db6d8bf9f25ba3d835ffa12d6
Change-Id: I1b8497508c8005a094824b4ccf9b220812b81bdb
Diffstat (limited to 'absl/synchronization')
| -rw-r--r-- | absl/synchronization/mutex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index cb0a3a1..32d9e3c 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -675,7 +675,7 @@ static unsigned TsanFlags(Mutex::MuHow how) { #endif Mutex::Mutex() : mu_(0) { - ABSL_TSAN_MUTEX_CREATE(this, 0); + ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_not_static); } static bool DebugOnlyIsExiting() { @@ -690,7 +690,7 @@ Mutex::~Mutex() { if (kDebugMode) { this->ForgetDeadlockInfo(); } - ABSL_TSAN_MUTEX_DESTROY(this, 0); + ABSL_TSAN_MUTEX_DESTROY(this, __tsan_mutex_not_static); } void Mutex::EnableDebugLog(const char *name) { |