From owner-svn-src-head@FreeBSD.ORG  Fri Feb  7 21:17:21 2014
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 ESMTPS id 6FB86514;
 Fri,  7 Feb 2014 21:17:21 +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 5938E19CF;
 Fri,  7 Feb 2014 21:17:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s17LHLQ8016616;
 Fri, 7 Feb 2014 21:17:21 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s17LHLMi016615;
 Fri, 7 Feb 2014 21:17:21 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201402072117.s17LHLMi016615@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Fri, 7 Feb 2014 21:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261608 - 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.17
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: Fri, 07 Feb 2014 21:17:21 -0000

Author: dim
Date: Fri Feb  7 21:17:20 2014
New Revision: 261608
URL: http://svnweb.freebsd.org/changeset/base/261608

Log:
  Apply a cleaner solution for the sign warnings that can occur when
  compiling libc++'s <locale> header with -Wsystem-headers on.
  
  This has also been submitted upstream.
  
  Reported by:	asomers

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

Modified: head/contrib/libc++/include/locale
==============================================================================
--- head/contrib/libc++/include/locale	Fri Feb  7 20:53:41 2014	(r261607)
+++ head/contrib/libc++/include/locale	Fri Feb  7 21:17:20 2014	(r261608)
@@ -1012,7 +1012,7 @@ num_get<_CharT, _InputIterator>::__do_ge
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
     {
-        if (__a_end - __a == (long)__buf.size())
+        if (__a_end == __a + __buf.size())
         {
             size_t __tmp = __buf.size();
             __buf.resize(2*__buf.size());
@@ -1062,7 +1062,7 @@ num_get<_CharT, _InputIterator>::__do_ge
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
     {
-        if (__a_end - __a == (long)__buf.size())
+        if (__a_end == __a + __buf.size())
         {
             size_t __tmp = __buf.size();
             __buf.resize(2*__buf.size());
@@ -1116,7 +1116,7 @@ num_get<_CharT, _InputIterator>::__do_ge
     char __exp = 'E';
     for (; __b != __e; ++__b)
     {
-        if (__a_end - __a == (long)__buf.size())
+        if (__a_end == __a + __buf.size())
         {
             size_t __tmp = __buf.size();
             __buf.resize(2*__buf.size());
@@ -1166,7 +1166,7 @@ num_get<_CharT, _InputIterator>::do_get(
     unsigned __dc = 0;
     for (; __b != __e; ++__b)
     {
-        if (__a_end - __a == (long)__buf.size())
+        if (__a_end == __a + __buf.size())
         {
             size_t __tmp = __buf.size();
             __buf.resize(2*__buf.size());