fix: remove warnings

This commit is contained in:
bolero-MURAKAMI 2013-11-10 18:46:24 +09:00
parent 1b09c5a672
commit f5e00839c1
2 changed files with 2 additions and 4 deletions

View file

@ -132,7 +132,6 @@ namespace sprout {
template<typename RealType, std::size_t bits, typename URNG, typename Random> template<typename RealType, std::size_t bits, typename URNG, typename Random>
inline SPROUT_CONSTEXPR sprout::pair<RealType, URNG> const inline SPROUT_CONSTEXPR sprout::pair<RealType, URNG> const
generate_canonical_impl_0_1(RealType r, RealType limit, RealType s, RealType mult, Random const& rnd) { generate_canonical_impl_0_1(RealType r, RealType limit, RealType s, RealType mult, Random const& rnd) {
typedef typename URNG::result_type base_result;
typedef sprout::pair<RealType, URNG> const pair_type; typedef sprout::pair<RealType, URNG> const pair_type;
return mult * r < limit ? sprout::random::detail::generate_canonical_impl_0_1<RealType, bits, URNG>( return mult * r < limit ? sprout::random::detail::generate_canonical_impl_0_1<RealType, bits, URNG>(
r, limit, r, limit,
@ -149,7 +148,6 @@ namespace sprout {
template<typename RealType, std::size_t bits, typename URNG, typename Random> template<typename RealType, std::size_t bits, typename URNG, typename Random>
inline SPROUT_CONSTEXPR sprout::pair<RealType, URNG> const inline SPROUT_CONSTEXPR sprout::pair<RealType, URNG> const
generate_canonical_impl_0_0(RealType r, RealType limit, Random const& rnd) { generate_canonical_impl_0_0(RealType r, RealType limit, Random const& rnd) {
typedef typename URNG::result_type base_result;
typedef sprout::pair<RealType, URNG> const pair_type; typedef sprout::pair<RealType, URNG> const pair_type;
return r < limit ? sprout::random::detail::generate_canonical_impl_0_1<RealType, bits, URNG>( return r < limit ? sprout::random::detail::generate_canonical_impl_0_1<RealType, bits, URNG>(
r, limit, r, limit,

View file

@ -209,7 +209,7 @@ namespace sprout {
template<typename Result> template<typename Result>
SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type gen1_0( SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type gen1_0(
Result const& result, Result const& result,
size_type n, size_type s, size_type m, size_type t, size_type p, size_type q size_type n, size_type s, size_type p, size_type q
) const ) const
{ {
return set1( return set1(
@ -229,7 +229,7 @@ namespace sprout {
gen1_1( gen1_1(
gen1_0( gen1_0(
result, result,
n, s, m, t, p, q n, s, p, q
), ),
n, s, m, t, p, q, n, s, m, t, p, q,
1 1