[libcxx] r191126 - David Chisnall: macro protect 'test' in __has_pointer_type_imp.

[Howard Hinnant]

Author: hhinnant
Date: Fri Sep 20 20:45:05 2013
New Revision: 191126

URL: http://llvm.org/viewvc/llvm-project?rev=191126&view=rev
Log:
David Chisnall:  macro protect 'test' in __has_pointer_type_imp.

Modified:
    libcxx/trunk/include/memory

Modified: libcxx/trunk/include/memory
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/memory?rev=191126&r1=191125&r2=191126&view=diff
==============================================================================
--- libcxx/trunk/include/memory (original)
+++ libcxx/trunk/include/memory Fri Sep 20 20:45:05 2013
@@ -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>
 {
 };