* include/bits/random.tcc (seed_seq::generate): Cast max()

operands to size_t to ensure a template match.
* include/std/bitset (_M_copy_from_ptr): Cast min() operands to
size_t to ensure a template match.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@187379 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9788eb6..f671bc7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-10  DJ Delorie  <dj@redhat.com>
+
+       * include/bits/random.tcc (seed_seq::generate): Cast max()
+       operands to size_t to ensure a template match.
+       * include/std/bitset (_M_copy_from_ptr): Cast min() operands to
+       size_t to ensure a template match.
+

 2012-05-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/53193
 2012-05-02  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/53193

diff --git a/libstdc++-v3/include/bits/random.tcc b/libstdc++-v3/include/bits/random.tcc
index 5da353f..5b90e5a 100644 (file)
--- a/libstdc++-v3/include/bits/random.tcc
+++ b/libstdc++-v3/include/bits/random.tcc
@@ -2789,7 +2789,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                       : (__n - 1) / 2;
       const size_t __p = (__n - __t) / 2;
       const size_t __q = __p + __t;
                       : (__n - 1) / 2;
       const size_t __p = (__n - __t) / 2;
       const size_t __q = __p + __t;

-      const size_t __m = std::max(__s + 1, __n);
+      const size_t __m = std::max(size_t(__s + 1), __n);

 
       for (size_t __k = 0; __k < __m; ++__k)
        {
 
       for (size_t __k = 0; __k < __m; ++__k)
        {

diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index 792a05a..7f3cb4d 100644 (file)
--- a/libstdc++-v3/include/std/bitset
+++ b/libstdc++-v3/include/std/bitset
@@ -1377,7 +1377,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
                       size_t __pos, size_t __n, _CharT __zero, _CharT __one)
       {
        reset();
                       size_t __pos, size_t __n, _CharT __zero, _CharT __one)
       {
        reset();

-       const size_t __nbits = std::min(_Nb, std::min(__n, __len - __pos));
+       const size_t __nbits = std::min(_Nb, std::min(__n, size_t(__len - __pos)));

        for (size_t __i = __nbits; __i > 0; --__i)
          {
            const _CharT __c = __s[__pos + __nbits - __i];
        for (size_t __i = __nbits; __i > 0; --__i)
          {
            const _CharT __c = __s[__pos + __nbits - __i];