aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2020-06-19 18:15:15 +0100
committerGiuliano Belinassi <giuliano.belinassi@usp.br>2020-08-17 13:14:17 -0300
commit878728b8966c14b4ac900fedac9d6146d344fd79 (patch)
treeb8fe13141dca68d4fb13b5ba323b83eb8d29b29f
parent382b55e58514e39ca06f37b20a02bfd0f752de20 (diff)
downloadgcc-878728b8966c14b4ac900fedac9d6146d344fd79.zip
gcc-878728b8966c14b4ac900fedac9d6146d344fd79.tar.gz
gcc-878728b8966c14b4ac900fedac9d6146d344fd79.tar.bz2
libstdc++: Fix some -Wsystem-headers warnings (PR 95765)
PR libstdc++/95765 * include/bits/stl_algobase.h (__size_to_integer(float)) (__size_to_integer(double), __size_to_integer(long double)) (__size_to_integer(__float128)): Cast return type explicitly. * include/bits/stl_uninitialized.h (__uninitialized_default_1<true>): Remove unused typedef.
-rw-r--r--libstdc++-v3/include/bits/stl_algobase.h8
-rw-r--r--libstdc++-v3/include/bits/stl_uninitialized.h3
2 files changed, 4 insertions, 7 deletions
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 41dd740d..4fc8850 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1039,14 +1039,14 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
#endif
inline _GLIBCXX_CONSTEXPR long long
- __size_to_integer(float __n) { return __n; }
+ __size_to_integer(float __n) { return (long long)__n; }
inline _GLIBCXX_CONSTEXPR long long
- __size_to_integer(double __n) { return __n; }
+ __size_to_integer(double __n) { return (long long)__n; }
inline _GLIBCXX_CONSTEXPR long long
- __size_to_integer(long double __n) { return __n; }
+ __size_to_integer(long double __n) { return (long long)__n; }
#if !defined(__STRICT_ANSI__) && defined(_GLIBCXX_USE_FLOAT128)
inline _GLIBCXX_CONSTEXPR long long
- __size_to_integer(__float128 __n) { return __n; }
+ __size_to_integer(__float128 __n) { return (long long)__n; }
#endif
template<typename _OutputIterator, typename _Size, typename _Tp>
diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h
index b5248fd..a3ccb72 100644
--- a/libstdc++-v3/include/bits/stl_uninitialized.h
+++ b/libstdc++-v3/include/bits/stl_uninitialized.h
@@ -553,9 +553,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static void
__uninit_default(_ForwardIterator __first, _ForwardIterator __last)
{
- typedef typename iterator_traits<_ForwardIterator>::value_type
- _ValueType;
-
if (__first == __last)
return;