From 8127758024da92cae589292d763aedc86fa3d34c Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Sat, 21 Sep 2013 01:45:05 +0000
Subject: [PATCH] David Chisnall:  macro protect 'test' in
 __has_pointer_type_imp.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@191126 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/memory | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/memory b/include/memory
index 3a98d1d5..bf44837f 100644
--- a/include/memory
+++ b/include/memory
@@ -917,13 +917,13 @@ public:
 
 namespace __has_pointer_type_imp
 {
-    template <class _Up> static __two test(...);
-    template <class _Up> static char test(typename _Up::pointer* = 0);
+    template <class _Up> static __two __test(...);
+    template <class _Up> static char __test(typename _Up::pointer* = 0);
 }
 
 template <class _Tp>
 struct __has_pointer_type
-    : public integral_constant<bool, sizeof(__has_pointer_type_imp::test<_Tp>(0)) == 1>
+    : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1>
 {
 };