From 0aeaf19c47dd42a8936110b9a844d6b62a7482be Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Wed, 24 Jul 2013 19:22:26 +0900 Subject: [PATCH] fix fit-algorithm implementation: min compare --- sprout/algorithm/fit/fill_n.hpp | 2 +- sprout/algorithm/fit/generate_n.hpp | 2 +- sprout/algorithm/fit/recurrence_n.hpp | 2 +- sprout/algorithm/fit/unfold_n.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sprout/algorithm/fit/fill_n.hpp b/sprout/algorithm/fit/fill_n.hpp index 0e4393c3..76c0c0dc 100644 --- a/sprout/algorithm/fit/fill_n.hpp +++ b/sprout/algorithm/fit/fill_n.hpp @@ -23,7 +23,7 @@ namespace sprout { return sprout::sub_copy( sprout::get_internal(sprout::fixed::fill_n(cont, n, value)), offset, - offset + NS_SSCRISK_CEL_OR_SPROUT::min(n, sprout::size(cont)) + offset + NS_SSCRISK_CEL_OR_SPROUT::min::difference_type>(n, sprout::size(cont)) ); } } // namespace detail diff --git a/sprout/algorithm/fit/generate_n.hpp b/sprout/algorithm/fit/generate_n.hpp index 6e0d4ab8..9aff7394 100644 --- a/sprout/algorithm/fit/generate_n.hpp +++ b/sprout/algorithm/fit/generate_n.hpp @@ -23,7 +23,7 @@ namespace sprout { return sprout::sub_copy( sprout::get_internal(sprout::fixed::generate_n(cont, n, gen)), offset, - offset + NS_SSCRISK_CEL_OR_SPROUT::min(n, sprout::size(cont)) + offset + NS_SSCRISK_CEL_OR_SPROUT::min::difference_type>(n, sprout::size(cont)) ); } } // namespace detail diff --git a/sprout/algorithm/fit/recurrence_n.hpp b/sprout/algorithm/fit/recurrence_n.hpp index 0c88b5a5..688c2831 100644 --- a/sprout/algorithm/fit/recurrence_n.hpp +++ b/sprout/algorithm/fit/recurrence_n.hpp @@ -24,7 +24,7 @@ namespace sprout { return sprout::sub_copy( sprout::get_internal(sprout::fixed::recurrence_n(cont, n, gen, inits...)), offset, - offset + NS_SSCRISK_CEL_OR_SPROUT::min(n, sprout::size(cont)) + offset + NS_SSCRISK_CEL_OR_SPROUT::min::difference_type>(n, sprout::size(cont)) ); } } // namespace detail diff --git a/sprout/algorithm/fit/unfold_n.hpp b/sprout/algorithm/fit/unfold_n.hpp index e8901148..0f2b133f 100644 --- a/sprout/algorithm/fit/unfold_n.hpp +++ b/sprout/algorithm/fit/unfold_n.hpp @@ -23,7 +23,7 @@ namespace sprout { return sprout::sub_copy( sprout::get_internal(sprout::fixed::unfold_n(cont, n, gen, init)), offset, - offset + NS_SSCRISK_CEL_OR_SPROUT::min(n, sprout::size(cont)) + offset + NS_SSCRISK_CEL_OR_SPROUT::min::difference_type>(n, sprout::size(cont)) ); } } // namespace detail