mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-12 14:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

22
sprout/algorithm/fixed/push_heap.hpp
View file

@ -2,8 +2,8 @@
#define SPROUT_ALGORITHM_FIXED_PUSH_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>
@ -16,22 +16,22 @@ namespace sprout {
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type push_heap_impl(
Container const& cont,
Compare comp,
typename sprout::fixed_container_traits<Container>::difference_type offset,
typename sprout::fixed_container_traits<Container>::difference_type n
typename sprout::container_traits<Container>::difference_type offset,
typename sprout::container_traits<Container>::difference_type n
)
{
return n != 0 && comp(*sprout::next(sprout::fixed_begin(cont), offset + (n - 1) / 2), *sprout::next(sprout::fixed_begin(cont), offset + n))
return n != 0 && comp(*sprout::next(sprout::internal_begin(cont), offset + (n - 1) / 2), *sprout::next(sprout::internal_begin(cont), offset + n))
? sprout::fixed::detail::push_heap_impl(
sprout::fixed::swap_element(
cont,
sprout::next(sprout::fixed_begin(cont), offset + (n - 1) / 2),
sprout::next(sprout::fixed_begin(cont), offset + n)
sprout::next(sprout::internal_begin(cont), offset + (n - 1) / 2),
sprout::next(sprout::internal_begin(cont), offset + n)
),
comp,
offset,
(n - 1) / 2
)
: sprout::clone(cont)
: sprout::deep_copy(cont)
;
}
} // namespace detail
@ -47,7 +47,7 @@ namespace sprout {
return sprout::fixed::detail::push_heap_impl(
cont,
comp,
sprout::fixed_begin_offset(cont),
sprout::internal_begin_offset(cont),
sprout::size(cont) - 1
);
}
@ -61,8 +61,8 @@ namespace sprout {
{
return sprout::fixed::detail::push_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) - 1
);
}