From 226a2e08e50f39f910b847f04fb16ab2cac6d5e1 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 28 Jan 2007 18:40:42 +0000 Subject: locale_facets.tcc (num_get<>::do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&), [...]): -Wconversion and -Woverflow fixes. 2007-01-28 Paolo Carlini * include/bits/locale_facets.tcc (num_get<>::do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&), num_put<>::_M_insert_int(_OutIter, ios_base&, _CharT, _ValueT)): -Wconversion and -Woverflow fixes. * include/bits/istream.tcc (operator>>(int&), operator>>(short&)): Likewise. * include/std/valarray (valarray<>::shift, cshift): Likewise. From-SVN: r121264 --- libstdc++-v3/include/std/valarray | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libstdc++-v3/include/std/valarray') diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index 87f30ec..50528bf 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -796,7 +796,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) else if (__n > 0) // shift left { if (size_t(__n) > _M_size) - __n = _M_size; + __n = int(_M_size); std::__valarray_copy_construct(_M_data + __n, _M_data + _M_size, __tmp_M_data); @@ -805,8 +805,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } else // shift right { - if (size_t(-__n) > _M_size) - __n = -_M_size; + if (-size_t(__n) > _M_size) + __n = -int(_M_size); std::__valarray_copy_construct(_M_data, _M_data + _M_size + __n, __tmp_M_data - __n); @@ -837,7 +837,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) else if (__n > 0) // cshift left { if (size_t(__n) > _M_size) - __n = __n % _M_size; + __n = int(__n % _M_size); std::__valarray_copy_construct(_M_data, _M_data + __n, __tmp_M_data + _M_size - __n); @@ -846,8 +846,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } else // cshift right { - if (size_t(-__n) > _M_size) - __n = -(size_t(-__n) % _M_size); + if (-size_t(__n) > _M_size) + __n = -int(-size_t(__n) % _M_size); std::__valarray_copy_construct(_M_data + _M_size + __n, _M_data + _M_size, __tmp_M_data); -- cgit v1.1