Author: dim
Date: Thu Dec 5 20:25:44 2013
New Revision: 259004
URL: http://svnweb.freebsd.org/changeset/base/259004
Log:
MFC r256082 (by decke)
Rename internal function test() to avoid name clashes with common
macros. This fixes ports like mysql 5.6 which has an internal macro
called test.
Discussed with: theraven
Modified:
stable/9/contrib/libc++/include/memory
Directory Properties:
stable/9/contrib/libc++/ (props changed)
Modified: stable/9/contrib/libc++/include/memory
==============================================================================
--- stable/9/contrib/libc++/include/memory Thu Dec 5 20:23:32 2013
(r259003)
+++ stable/9/contrib/libc++/include/memory Thu Dec 5 20:25:44 2013
(r259004)
@@ -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>
{
};
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
