From owner-svn-src-stable-9@FreeBSD.ORG  Thu Dec  5 20:25:45 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@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 ESMTPS id 32F89C3F;
 Thu,  5 Dec 2013 20:25:45 +0000 (UTC)
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 1F38818DC;
 Thu,  5 Dec 2013 20:25:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB5KPiw6095049;
 Thu, 5 Dec 2013 20:25:44 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB5KPiL3095047;
 Thu, 5 Dec 2013 20:25:44 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201312052025.rB5KPiL3095047@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 5 Dec 2013 20:25:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r259004 - stable/9/contrib/libc++/include
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Dec 2013 20:25:45 -0000

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