[desuructive changes] container traits new interface [破壊的変更]

This commit is contained in:
bolero-MURAKAMI 2012-03-31 16:24:13 +09:00
parent 52a2178ac1
commit ad60c8c530
356 changed files with 3183 additions and 3251 deletions

View file

@ -2,8 +2,8 @@
#define SPROUT_ALGORITHM_FIT_UNIQUE_HPP
#include <sprout/config.hpp>
#include <sprout/fixed_container/traits.hpp>
#include <sprout/fixed_container/functions.hpp>
#include <sprout/container/traits.hpp>
#include <sprout/container/functions.hpp>
#include <sprout/algorithm/fixed/unique.hpp>
#include <sprout/algorithm/fit/result_of.hpp>
#include <sprout/sub_array.hpp>
@ -15,11 +15,11 @@ namespace sprout {
template<typename Container>
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Container>::type unique_impl(
Container const& cont,
typename sprout::fixed_container_traits<Container>::difference_type offset
typename sprout::container_traits<Container>::difference_type offset
)
{
return sprout::sub_copy(
sprout::get_fixed(sprout::fixed::unique(cont)),
sprout::get_internal(sprout::fixed::unique(cont)),
offset,
offset + sprout::size(cont) - sprout::detail::overlap_count(sprout::begin(cont), sprout::end(cont))
);
@ -33,7 +33,7 @@ namespace sprout {
Container const& cont
)
{
return sprout::fit::detail::unique_impl(cont, sprout::fixed_begin_offset(cont));
return sprout::fit::detail::unique_impl(cont, sprout::internal_begin_offset(cont));
}
namespace detail {
@ -41,11 +41,11 @@ namespace sprout {
SPROUT_CONSTEXPR inline typename sprout::fit::result_of::algorithm<Container>::type unique_impl(
Container const& cont,
BinaryPredicate pred,
typename sprout::fixed_container_traits<Container>::difference_type offset
typename sprout::container_traits<Container>::difference_type offset
)
{
return sprout::sub_copy(
sprout::get_fixed(sprout::fixed::unique(cont, pred)),
sprout::get_internal(sprout::fixed::unique(cont, pred)),
offset,
offset + sprout::size(cont) - sprout::detail::overlap_count(sprout::begin(cont), sprout::end(cont), pred)
);
@ -60,7 +60,7 @@ namespace sprout {
BinaryPredicate pred
)
{
return sprout::fit::detail::unique_impl(cont, pred, sprout::fixed_begin_offset(cont));
return sprout::fit::detail::unique_impl(cont, pred, sprout::internal_begin_offset(cont));
}
} // namespace fit
} // namespace sprout