svn commit: r261608 - head/contrib/libc++/include

[Dimitry Andric]

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());