From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 11 Oct 2019 15:29:50 +0000 (+0000)
Subject: Avoid warnings in <charconv>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=109d3d52526324a777324b88cc95da2c86735442;p=thirdparty%2Fgcc.git

Avoid warnings in <charconv>

	* include/bits/charconv.h (__to_chars_len): Avoid -Wsign-compare
	warnings.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276889 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f04a6840ba4..1459185de26f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-11  Jonathan Wakely  <jwakely@redhat.com>
+
+	* include/bits/charconv.h (__to_chars_len): Avoid -Wsign-compare
+	warnings.
+
 2019-10-10  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/91057
diff --git a/libstdc++-v3/include/bits/charconv.h b/libstdc++-v3/include/bits/charconv.h
index a5b6be567bcb..7c0922fec21b 100644
--- a/libstdc++-v3/include/bits/charconv.h
+++ b/libstdc++-v3/include/bits/charconv.h
@@ -50,16 +50,16 @@ namespace __detail
       static_assert(is_unsigned<_Tp>::value, "implementation bug");
 
       unsigned __n = 1;
-      const int __b2 = __base  * __base;
-      const int __b3 = __b2 * __base;
-      const int __b4 = __b3 * __base;
+      const unsigned __b2 = __base  * __base;
+      const unsigned __b3 = __b2 * __base;
+      const unsigned long __b4 = __b3 * __base;
       for (;;)
 	{
-	  if (__value < __base) return __n;
+	  if (__value < (unsigned)__base) return __n;
 	  if (__value < __b2) return __n + 1;
 	  if (__value < __b3) return __n + 2;
 	  if (__value < __b4) return __n + 3;
-	  __value /= (unsigned)__b4;
+	  __value /= __b4;
 	  __n += 4;
 	}
     }