commit 49e145e128b51353caa90ae076385f7b19be9c04
author Howard Hinnant <hhinnant@apple.com> Tue Oct 30 19:06:59 2012 +0000
committer Howard Hinnant <hhinnant@apple.com> Tue Oct 30 19:06:59 2012 +0000
tree eb6e95d6e44d1f4a88c0a17c509cc100949931f7
parent 2e136f43dedda5d66da07f5f2dfb0a02712e9e36

Rename uses of _ and __ because these are getting stepped on by macros from other system code.

llvm-svn: 167038
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 54d333a601a84e10710463e845f9f3a0cb6ca72b

src/memory.cpp

diff --git a/src/memory.cpp b/src/memory.cpp
index 3884a2b..14084a5 100644
--- a/src/memory.cpp
+++ b/src/memory.cpp
@@ -125,14 +125,14 @@
 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 @@
 void
 __sp_mut::unlock() _NOEXCEPT
 {
-    static_cast<mutex*>(_)->unlock();
+    static_cast<mutex*>(__lx)->unlock();
 }
 
 __sp_mut&