diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-03-29 20:53:51 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2011-03-29 20:53:51 +0000 |
| commit | 5377a72618a574b28f121dc45e6612418f11d96d (patch) | |
| tree | 8dd18f9d0a6d8b9d0b38d505e33d37244cd1c655 /contrib/libstdc++/include | |
| parent | 301afbce990a90ae28d264bd02cb39bb746887f6 (diff) | |
| parent | 0e5d163d93004259465517b8c58ecda57537d2f9 (diff) | |
Notes
Diffstat (limited to 'contrib/libstdc++/include')
| -rw-r--r-- | contrib/libstdc++/include/std/std_valarray.h | 2 | ||||
| -rw-r--r-- | contrib/libstdc++/include/tr1/random | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/contrib/libstdc++/include/std/std_valarray.h b/contrib/libstdc++/include/std/std_valarray.h index 87f30ec4e028..6ef21500fc67 100644 --- a/contrib/libstdc++/include/std/std_valarray.h +++ b/contrib/libstdc++/include/std/std_valarray.h @@ -1010,7 +1010,7 @@ _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(>>, __shift_right) { \ typedef _BinClos<_Name, _Constant, _ValArray, _Tp, _Tp> _Closure; \ typedef typename __fun<_Name, _Tp>::result_type _Rt; \ - return _Expr<_Closure, _Tp>(_Closure(__t, __v)); \ + return _Expr<_Closure, _Rt>(_Closure(__t, __v)); \ } _DEFINE_BINARY_OPERATOR(+, __plus) diff --git a/contrib/libstdc++/include/tr1/random b/contrib/libstdc++/include/tr1/random index 56ea508575d3..c97f16d2a2d7 100644 --- a/contrib/libstdc++/include/tr1/random +++ b/contrib/libstdc++/include/tr1/random @@ -1618,7 +1618,11 @@ _GLIBCXX_BEGIN_NAMESPACE(tr1) result_type _M_call(_UniformRandomNumberGenerator& __urng, result_type __min, result_type __max, true_type) - { return result_type(__urng() % (__max - __min + 1)) + __min; } + { + typedef typename __gnu_cxx::__add_unsigned<typename + _UniformRandomNumberGenerator::result_type>::__type __utype; + return result_type(__utype(__urng()) % (__max - __min + 1)) + __min; + } template<typename _UniformRandomNumberGenerator> result_type |