David Chisnall: macro protect 'test' in __has_pointer_type_imp.
llvm-svn: 191126
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: b1c82cd09022f5e94f1d6c20a8d9182d7dd68abc
diff --git a/include/memory b/include/memory
index 3a98d1d..bf44837 100644
--- a/include/memory
+++ b/include/memory
@@ -917,13 +917,13 @@
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>
{
};