summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/std/bitset
diff options
context:
space:
mode:
authordj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-10 20:32:47 +0000
committerdj <dj@138bc75d-0d04-0410-961f-82ee72b054a4>2012-05-10 20:32:47 +0000
commit91d963c4ed794fb70b0a85d6ffa5b85a979acd94 (patch)
tree0b15ce93e3c8d4a9c9b975358ae6487845e055c7 /libstdc++-v3/include/std/bitset
parent91f0ab48bd9b2e18998a63c16f53e01d41afbc89 (diff)
downloadppe42-gcc-91d963c4ed794fb70b0a85d6ffa5b85a979acd94.tar.gz
ppe42-gcc-91d963c4ed794fb70b0a85d6ffa5b85a979acd94.zip
* 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/trunk@187376 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/bitset')
-rw-r--r--libstdc++-v3/include/std/bitset2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index 792a05ace15..7f3cb4dec85 100644
--- 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();
- 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];
OpenPOWER on IntegriCloud