svn commit: r256082 - head/contrib/libc++/include

[Bernhard Froehlich]

Author: decke (ports committer)
Date: Sun Oct  6 10:12:11 2013
New Revision: 256082
URL: http://svnweb.freebsd.org/changeset/base/256082

Log:
  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

Modified:
  head/contrib/libc++/include/memory

Modified: head/contrib/libc++/include/memory
==============================================================================
--- head/contrib/libc++/include/memory	Sun Oct  6 09:55:28 2013	(r256081)
+++ head/contrib/libc++/include/memory	Sun Oct  6 10:12:11 2013	(r256082)
@@ -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>
 {
 };