svn commit: r256083 - projects/random_number_generator/contrib/libc++/include

[Mark Murray]

Author: markm
Date: Sun Oct  6 12:31:24 2013
New Revision: 256083
URL: http://svnweb.freebsd.org/changeset/base/256083

Log:
  MFC - tracking commit

Modified:
  projects/random_number_generator/contrib/libc++/include/memory
Directory Properties:
  projects/random_number_generator/   (props changed)
  projects/random_number_generator/contrib/libc++/   (props changed)

Modified: projects/random_number_generator/contrib/libc++/include/memory
==============================================================================
--- projects/random_number_generator/contrib/libc++/include/memory	Sun Oct  6 10:12:11 2013	(r256082)
+++ projects/random_number_generator/contrib/libc++/include/memory	Sun Oct  6 12:31:24 2013	(r256083)
@@ -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>
 {
 };