diff options
| author | theraven <theraven@FreeBSD.org> | 2012-11-13 03:27:43 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-11-13 03:27:43 +0000 |
| commit | 8af97236b44c01761e1294025653d7f19dac7dd9 (patch) | |
| tree | b0b795ada355b89fa0679851158e12e7b0af551d /contrib/libc++/src | |
| parent | af2fb35f8e88c3065ae59da7ac18d1bd2a3aca56 (diff) | |
| download | FreeBSD-src-8af97236b44c01761e1294025653d7f19dac7dd9.zip FreeBSD-src-8af97236b44c01761e1294025653d7f19dac7dd9.tar.gz | |
Import new version of libc++ into base.
Diffstat (limited to 'contrib/libc++/src')
| -rw-r--r-- | contrib/libc++/src/memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libc++/src/memory.cpp b/contrib/libc++/src/memory.cpp index 3884a2b..14084a5 100644 --- a/contrib/libc++/src/memory.cpp +++ b/contrib/libc++/src/memory.cpp @@ -125,14 +125,14 @@ static const std::size_t __sp_mut_count = 16; static mutex mut_back[__sp_mut_count]; _LIBCPP_CONSTEXPR __sp_mut::__sp_mut(void* p) _NOEXCEPT - : _(p) + : __lx(p) { } void __sp_mut::lock() _NOEXCEPT { - mutex& m = *static_cast<mutex*>(_); + mutex& m = *static_cast<mutex*>(__lx); unsigned count = 0; while (!m.try_lock()) { @@ -148,7 +148,7 @@ __sp_mut::lock() _NOEXCEPT void __sp_mut::unlock() _NOEXCEPT { - static_cast<mutex*>(_)->unlock(); + static_cast<mutex*>(__lx)->unlock(); } __sp_mut& |
