diff mbox series

[committed,5/5] libstdc++: Fix -Wsign-compare warnings

Message ID 20200910182044.GK6061@redhat.com
State New
Headers show
Series [committed,1/5] libstdc++: Fix -Wnarrowing warnings | expand

Commit Message

Jonathan Wakely Sept. 10, 2020, 6:20 p.m. UTC 
* include/bits/locale_conv.h (__do_str_codecvt, __str_codecvt_in_all):
             Add casts to compare types of the same signedness.

Tested powerpc64le-linux. Committed to trunk.
diff mbox series

Patch

commit 1d5589d11e61fa78b0c0e845728412b1cc6043d8
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Sep 10 18:57:39 2020

    libstdc++: Fix -Wsign-compare warnings
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/locale_conv.h (__do_str_codecvt, __str_codecvt_in_all):
            Add casts to compare types of the same signedness.

diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
index 4a11e237623..f1d7032e8bc 100644
--- a/libstdc++-v3/include/bits/locale_conv.h
+++ b/libstdc++-v3/include/bits/locale_conv.h
@@ -78,7 +78,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	  __outchars = __outnext - &__outstr.front();
 	}
       while (__result == codecvt_base::partial && __next != __last
-	     && (__outstr.size() - __outchars) < __maxlen);
+	     && ptrdiff_t(__outstr.size() - __outchars) < __maxlen);
 
       if (__result == codecvt_base::error)
 	{
@@ -142,7 +142,7 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
       _State __state = {};
       size_t __n;
       return __str_codecvt_in(__first, __last, __outstr, __cvt, __state, __n)
-	&& (__n == (__last - __first));
+	&& (__n == size_t(__last - __first));
     }
 
   // Convert wide character string to narrow.