[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_FIXED_MAKE_PARTIAL_HEAP_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/iterator/operation.hpp>
#include <sprout/algorithm/fixed/result_of.hpp>
#include <sprout/algorithm/fixed/swap_element.hpp>
@ -19,20 +19,20 @@ namespace sprout {
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_partial_heap_impl_1(
Container const& cont,
Compare comp,
typename sprout::fixed_container_traits<Container>::difference_type offset,
typename sprout::fixed_container_traits<Container>::difference_type size,
typename sprout::fixed_container_traits<Container>::difference_type middle_size,
typename sprout::fixed_container_traits<Container>::difference_type n
typename sprout::container_traits<Container>::difference_type offset,
typename sprout::container_traits<Container>::difference_type size,
typename sprout::container_traits<Container>::difference_type middle_size,
typename sprout::container_traits<Container>::difference_type n
)
{
return n < size
? comp(*sprout::next(sprout::fixed_begin(cont), offset + n), *sprout::next(sprout::fixed_begin(cont), offset))
? comp(*sprout::next(sprout::internal_begin(cont), offset + n), *sprout::next(sprout::internal_begin(cont), offset))
? sprout::fixed::detail::make_partial_heap_impl_1(
sprout::fixed::detail::pop_heap_impl(
sprout::fixed::swap_element(
cont,
sprout::next(sprout::fixed_begin(cont), offset + n),
sprout::next(sprout::fixed_begin(cont), offset)
sprout::next(sprout::internal_begin(cont), offset + n),
sprout::next(sprout::internal_begin(cont), offset)
),
comp,
offset,
@ -45,16 +45,16 @@ namespace sprout {
n + 1
)
: sprout::fixed::detail::make_partial_heap_impl_1(cont, comp, offset, size, middle_size, n + 1)
: sprout::clone(cont)
: sprout::deep_copy(cont)
;
}
template<typename Container, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_partial_heap_impl(
Container const& cont,
Compare comp,
typename sprout::fixed_container_traits<Container>::difference_type offset,
typename sprout::fixed_container_traits<Container>::difference_type size,
typename sprout::fixed_container_traits<Container>::difference_type middle_size
typename sprout::container_traits<Container>::difference_type offset,
typename sprout::container_traits<Container>::difference_type size,
typename sprout::container_traits<Container>::difference_type middle_size
)
{
return sprout::fixed::detail::make_partial_heap_impl_1(
@ -73,14 +73,14 @@ namespace sprout {
template<typename Container, typename Compare>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_partial_heap(
Container const& cont,
typename sprout::fixed_container_traits<Container>::const_iterator middle,
typename sprout::container_traits<Container>::const_iterator middle,
Compare comp
)
{
return sprout::fixed::detail::make_partial_heap_impl(
cont,
comp,
sprout::fixed_begin_offset(cont),
sprout::internal_begin_offset(cont),
sprout::size(cont),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::begin(cont), middle)
);
@ -91,13 +91,13 @@ namespace sprout {
template<typename Container>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type make_partial_heap(
Container const& cont,
typename sprout::fixed_container_traits<Container>::const_iterator middle
typename sprout::container_traits<Container>::const_iterator middle
)
{
return sprout::fixed::detail::make_partial_heap_impl(
cont,
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::less<typename sprout::fixed_container_traits<Container>::value_type>(),
sprout::fixed_begin_offset(cont),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::less<typename sprout::container_traits<Container>::value_type>(),
sprout::internal_begin_offset(cont),
sprout::size(cont),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::begin(cont), middle)
);