From 54d333a601a84e10710463e845f9f3a0cb6ca72b Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 30 Oct 2012 19:06:59 +0000
Subject: Rename uses of _ and __ because these are getting stepped on by
 macros from other system code.

llvm-svn: 167038
---
 libcxx/src/memory.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libcxx/src/memory.cpp')

diff --git a/libcxx/src/memory.cpp b/libcxx/src/memory.cpp
index 3884a2b3abf..14084a5206a 100644
--- a/libcxx/src/memory.cpp
+++ b/libcxx/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&
-- 
cgit v1.2.3