diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-28 18:40:42 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-01-28 18:40:42 +0000 |
| commit | 79564567f601d0f7187f9df4d8982f2ac6bc3c20 (patch) | |
| tree | df114705c63752201601d1f2f2f22989ed2ffe17 /libstdc++-v3/include/std/valarray | |
| parent | d05f521d49e16ad5ac10cf7fe213d36e0d1e0c15 (diff) | |
| download | ppe42-gcc-79564567f601d0f7187f9df4d8982f2ac6bc3c20.tar.gz ppe42-gcc-79564567f601d0f7187f9df4d8982f2ac6bc3c20.zip | |
2007-01-28 Paolo Carlini <pcarlini@suse.de>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121264 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/valarray')
| -rw-r--r-- | libstdc++-v3/include/std/valarray | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index 87f30ec4e02..50528bfa7fd 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); |
