fix container_traits for array-like classes

fix coding style algorithm/
This commit is contained in:
bolero-MURAKAMI 2012-09-29 17:10:46 +09:00
parent 06f1933220
commit 0c00166c5f
123 changed files with 1608 additions and 2224 deletions

View file

@ -13,14 +13,18 @@ namespace sprout {
namespace fixed {
namespace detail {
template<typename Container, typename Compare>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type push_heap_impl(
Container const& cont,
Compare comp,
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
push_heap_impl(
Container const& cont, Compare comp,
typename sprout::container_traits<Container>::difference_type offset,
typename sprout::container_traits<Container>::difference_type n
)
{
return n != 0 && comp(*sprout::next(sprout::internal_begin(cont), offset + (n - 1) / 2), *sprout::next(sprout::internal_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,
@ -39,29 +43,19 @@ namespace sprout {
// push_heap
//
template<typename Container, typename Compare>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type push_heap(
Container const& cont,
Compare comp
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
push_heap(Container const& cont, Compare comp) {
return sprout::fixed::detail::push_heap_impl(
cont,
comp,
cont, comp,
sprout::internal_begin_offset(cont),
sprout::size(cont) - 1
);
}
//
// push_heap
//
template<typename Container>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type push_heap(
Container const& cont
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
push_heap(Container const& cont) {
return sprout::fixed::detail::push_heap_impl(
cont,
NS_SSCRISK_CEL_OR_SPROUT::less<typename sprout::container_traits<Container>::value_type>(),
cont, NS_SSCRISK_CEL_OR_SPROUT::less<typename sprout::container_traits<Container>::value_type>(),
sprout::internal_begin_offset(cont),
sprout::size(cont) - 1
);