From ada8d857cb36df3448b46e085b95b4cfe55c8f0a Mon Sep 17 00:00:00 2001 From: jfcarroll Date: Thu, 2 Sep 2021 11:11:41 -0700 Subject: [PATCH] Somehow this change was dropped. PiperOrigin-RevId: 394501870 --- cpp/platform/impl/windows/mutex.cc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cpp/platform/impl/windows/mutex.cc b/cpp/platform/impl/windows/mutex.cc index 3923e0e6..93d40799 100644 --- a/cpp/platform/impl/windows/mutex.cc +++ b/cpp/platform/impl/windows/mutex.cc @@ -22,27 +22,21 @@ namespace windows { // threads. // // https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/Lock.html -Mutex::Mutex(Mutex::Mode mode) - : mode_(mode) { -} +Mutex::Mutex(Mutex::Mode mode) : mode_(mode) {} void Mutex::Lock() { if (mode_ == Mutex::Mode::kRegular || mode_ == Mutex::Mode::kRegularNoCheck) { mutex_impl_.lock(); - } else { - if (mode_ == Mutex::Mode::kRecursive) { - recursive_mutex_impl_.lock(); - } + } else if (mode_ == Mutex::Mode::kRecursive) { + recursive_mutex_impl_.lock(); } } void Mutex::Unlock() { if (mode_ == Mutex::Mode::kRegular || mode_ == Mutex::Mode::kRegularNoCheck) { mutex_impl_.unlock(); - } else { - if (mode_ == Mutex::Mode::kRecursive) { - recursive_mutex_impl_.unlock(); - } + } else if (mode_ == Mutex::Mode::kRecursive) { + recursive_mutex_impl_.unlock(); } }