From cd8e388205dab0c6cdfbd5884ca0f3127fe71ed5 Mon Sep 17 00:00:00 2001
From: decke <decke@FreeBSD.org>
Date: Sun, 6 Oct 2013 10:12:11 +0000
Subject: ename internal function test() to avoid name clashes with common
 macros. This fixes ports like mysql 5.6 which has an internal macro called
 test.

Approved by:	re (gjb)
Discussed with:	theraven
---
 contrib/libc++/include/memory | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/libc++/include/memory b/contrib/libc++/include/memory
index ffd0cd0..3451546 100644
--- a/contrib/libc++/include/memory
+++ b/contrib/libc++/include/memory
@@ -965,13 +965,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>
 {
 };
 
-- 
cgit v1.1