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

fix container_traits for array-like classes

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

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

@ -13,7 +13,8 @@ namespace sprout {
namespace fixed {
namespace detail {
template<typename Container, typename Compare>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type pop_heap_impl(
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
pop_heap_impl(
Container const& cont,
Compare comp,
typename sprout::container_traits<Container>::difference_type offset,
@ -23,7 +24,8 @@ namespace sprout {
typename sprout::container_traits<Container>::difference_type r = 2
)
{
return r < size && comp(*sprout::next(sprout::internal_begin(cont), offset + l), *sprout::next(sprout::internal_begin(cont), offset + r))
return r < size
&& comp(*sprout::next(sprout::internal_begin(cont), offset + l), *sprout::next(sprout::internal_begin(cont), offset + r))
? comp(*sprout::next(sprout::internal_begin(cont), offset + n), *sprout::next(sprout::internal_begin(cont), offset + r))
? sprout::fixed::detail::pop_heap_impl(
sprout::fixed::swap_element(
@ -63,11 +65,8 @@ namespace sprout {
// pop_heap
//
template<typename Container, typename Compare>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type pop_heap(
Container const& cont,
Compare comp
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
pop_heap(Container const& cont, Compare comp) {
return sprout::fixed::detail::pop_heap_impl(
sprout::fixed::swap_element(cont, sprout::begin(cont), sprout::end(cont) - 1),
comp,
@ -75,14 +74,9 @@ namespace sprout {
sprout::size(cont) - 1
);
}
//
// pop_heap
//
template<typename Container>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type pop_heap(
Container const& cont
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Container>::type
pop_heap(Container const& cont) {
return sprout::fixed::detail::pop_heap_impl(
sprout::fixed::swap_element(cont, sprout::begin(cont), sprout::end(cont) - 1),
NS_SSCRISK_CEL_OR_SPROUT::less<typename sprout::container_traits<Container>::value_type>(),