* include/bits/istream.tcc (getline): Make sure arguments passed

to min/max have the same type.
* include/bits/locale_facets.tcc (__verify_grouping): Likewise.
* include/bits/stl_deque.h (_Deque_base::_Deque_base): Likewise.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8cca4db..4ab2ddd 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-22  Alexandre Oliva  <aoliva@redhat.com>
+
+       * include/bits/istream.tcc (getline): Make sure arguments passed
+       to min/max have the same type.
+       * include/bits/locale_facets.tcc (__verify_grouping): Likewise.
+       * include/bits/stl_deque.h (_Deque_base::_Deque_base): Likewise.
+
 2004-06-22  Benjamin Kosnik  <bkoz@redhat.com>
 
        * docs/html/abi.html: Update links.

diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index 59a44de..09339e9 100644 (file)
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -598,7 +598,8 @@ namespace std
                {
                  streamsize __size = std::min(streamsize(__sb->egptr()
                                                          - __sb->gptr()),
-                                              __n - _M_gcount - 1);
+                                              streamsize(__n - _M_gcount
+                                                         - 1));
                  if (__size > 1)
                    {
                      const char_type* __p = traits_type::find(__sb->gptr(),

diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 0c181cf..8bcb035 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -2448,7 +2448,7 @@ namespace std
                    const string& __grouping_tmp)
   {
     const size_t __n = __grouping_tmp.size() - 1;
-    const size_t __min = std::min(__n, __grouping_size - 1);
+    const size_t __min = std::min(__n, size_t(__grouping_size - 1));
     size_t __i = __n;
     bool __test = true;
     

diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index d4f2439..fc58581 100644 (file)
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -446,7 +446,7 @@ namespace _GLIBCXX_STD
       size_t __num_nodes = __num_elements / __deque_buf_size(sizeof(_Tp)) + 1;
 
       this->_M_impl._M_map_size = std::max((size_t) _S_initial_map_size,
-                                  __num_nodes + 2);
+                                  size_t(__num_nodes + 2));
       this->_M_impl._M_map = _M_allocate_map(this->_M_impl._M_map_size);
 
       // For "small" maps (needing less than _M_map_size nodes), allocation