diff options
| author | Dan Albert <danalbert@google.com> | 2017-03-20 18:55:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-20 18:55:32 +0000 |
| commit | 484d8fb3291dd4d29c3d9ef6634cb9fdceb08595 (patch) | |
| tree | 98be0728c8a7e96003719c4145662f487a663d81 /src/mutex.cpp | |
| parent | 43580c8f896fc0a272d6a45b280d6f08fb7c7719 (diff) | |
| parent | ed31f4b9be19ad4eaff38d16fe13a5f8e8da2c45 (diff) | |
| download | external_libcxx-484d8fb3291dd4d29c3d9ef6634cb9fdceb08595.tar.gz external_libcxx-484d8fb3291dd4d29c3d9ef6634cb9fdceb08595.tar.bz2 external_libcxx-484d8fb3291dd4d29c3d9ef6634cb9fdceb08595.zip | |
Merge to upstream r297772. am: b9e7f084bd am: fabe890b75
am: ed31f4b9be
Change-Id: Ieb19cbc938b9511d6441b9ac7cf6a3e13c4daf74
Diffstat (limited to 'src/mutex.cpp')
| -rw-r--r-- | src/mutex.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mutex.cpp b/src/mutex.cpp index 338b79f2f..b858e8877 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -11,7 +11,6 @@ #include "mutex" #include "limits" #include "system_error" -#include "cassert" #include "include/atomic_support.h" _LIBCPP_BEGIN_NAMESPACE_STD @@ -45,7 +44,7 @@ mutex::unlock() _NOEXCEPT { int ec = __libcpp_mutex_unlock(&__m_); (void)ec; - assert(ec == 0); + _LIBCPP_ASSERT(ec == 0, "call to mutex::unlock failed"); } // recursive_mutex @@ -61,7 +60,7 @@ recursive_mutex::~recursive_mutex() { int e = __libcpp_recursive_mutex_destroy(&__m_); (void)e; - assert(e == 0); + _LIBCPP_ASSERT(e == 0, "call to ~recursive_mutex() failed"); } void @@ -77,7 +76,7 @@ recursive_mutex::unlock() _NOEXCEPT { int e = __libcpp_recursive_mutex_unlock(&__m_); (void)e; - assert(e == 0); + _LIBCPP_ASSERT(e == 0, "call to recursive_mutex::unlock() failed"); } bool |