From owner-svn-src-head@FreeBSD.ORG  Sun Oct  6 10:12:12 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0E79B492;
 Sun,  6 Oct 2013 10:12:12 +0000 (UTC)
 (envelope-from decke@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F11D92257;
 Sun,  6 Oct 2013 10:12:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96ACBWO057242;
 Sun, 6 Oct 2013 10:12:11 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96ACBH9057241;
 Sun, 6 Oct 2013 10:12:11 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201310061012.r96ACBH9057241@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Sun, 6 Oct 2013 10:12:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256082 - head/contrib/libc++/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 10:12:12 -0000

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>
 {
 };