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

fix: less.hpp header, erase lower/upper_bound detail header

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-09-02 14:46:13 +09:00
parent 85ac03fa5f
commit 5686785ea9
5 changed files with 35 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sprout/algorithm/equal_range.hpp
View file

@ -14,6 +14,7 @@
#include <sprout/algorithm/lower_bound.hpp> #include <sprout/algorithm/lower_bound.hpp>
#include <sprout/algorithm/upper_bound.hpp> #include <sprout/algorithm/upper_bound.hpp>
#include <sprout/iterator/operation.hpp> #include <sprout/iterator/operation.hpp>
#include <sprout/functional/less.hpp>
#include <sprout/utility/pair/pair.hpp> #include <sprout/utility/pair/pair.hpp>
namespace sprout { namespace sprout {

18
sprout/algorithm/lower_bound.hpp
View file

@ -9,12 +9,28 @@
#ifndef SPROUT_ALGORITHM_LOWER_BOUND_HPP #ifndef SPROUT_ALGORITHM_LOWER_BOUND_HPP
#define SPROUT_ALGORITHM_LOWER_BOUND_HPP #define SPROUT_ALGORITHM_LOWER_BOUND_HPP
#include <iterator>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/iterator/next.hpp>
#include <sprout/iterator/distance.hpp> #include <sprout/iterator/distance.hpp>
#include <sprout/functional/less.hpp> #include <sprout/functional/less.hpp>
#include <sprout/detail/algorithm/lower_bound.hpp>
namespace sprout { namespace sprout {
namespace detail {
template<typename ForwardIterator, typename T, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
lower_bound(
ForwardIterator first, typename std::iterator_traits<ForwardIterator>::difference_type len,
T const& value, Compare comp
)
{
return len == 0 ? first
: comp(*sprout::next(first, len / 2), value)
? sprout::detail::lower_bound(sprout::next(first, len / 2 + 1), len - (len / 2 + 1), value, comp)
: sprout::detail::lower_bound(first, len / 2, value, comp)
;
}
} // namespace detail
// 25.4.3.1 lower_bound // 25.4.3.1 lower_bound
// //

18
sprout/algorithm/upper_bound.hpp
View file

@ -9,12 +9,28 @@
#ifndef SPROUT_ALGORITHM_UPPER_BOUND_HPP #ifndef SPROUT_ALGORITHM_UPPER_BOUND_HPP
#define SPROUT_ALGORITHM_UPPER_BOUND_HPP #define SPROUT_ALGORITHM_UPPER_BOUND_HPP
#include <iterator>
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/iterator/next.hpp>
#include <sprout/iterator/distance.hpp> #include <sprout/iterator/distance.hpp>
#include <sprout/functional/less.hpp> #include <sprout/functional/less.hpp>
#include <sprout/detail/algorithm/upper_bound.hpp>
namespace sprout { namespace sprout {
namespace detail {
template<typename ForwardIterator, typename T, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
upper_bound(
ForwardIterator first, typename std::iterator_traits<ForwardIterator>::difference_type len,
T const& value, Compare comp
)
{
return len == 0 ? first
: comp(value, *sprout::next(first, len / 2))
? sprout::detail::upper_bound(first, len / 2, value, comp)
: sprout::detail::upper_bound(sprout::next(first, len / 2 + 1), len - (len / 2 + 1), value, comp)
;
}
} // namespace detail
// 25.4.3.2 upper_bound // 25.4.3.2 upper_bound
// //

34
sprout/detail/algorithm/lower_bound.hpp
View file

@ -1,34 +0,0 @@
/*=============================================================================
Copyright (c) 2011-2013 Bolero MURAKAMI
Copyright (C) 2011 RiSK (sscrisk)
https://github.com/bolero-MURAKAMI/Sprout
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
#ifndef SPROUT_DETAIL_ALGORITHM_LOWER_BOUND_HPP
#define SPROUT_DETAIL_ALGORITHM_LOWER_BOUND_HPP
#include <iterator>
#include <sprout/config.hpp>
#include <sprout/iterator/next.hpp>
namespace sprout {
namespace detail {
template<typename ForwardIterator, typename T, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
lower_bound(
ForwardIterator first, typename std::iterator_traits<ForwardIterator>::difference_type len,
T const& value, Compare comp
)
{
return len == 0 ? first
: comp(*sprout::next(first, len / 2), value)
? sprout::detail::lower_bound(sprout::next(first, len / 2 + 1), len - (len / 2 + 1), value, comp)
: sprout::detail::lower_bound(first, len / 2, value, comp)
;
}
} // namespace detail
} // namespace sprout
#endif // #ifndef SPROUT_DETAIL_ALGORITHM_LOWER_BOUND_HPP

34
sprout/detail/algorithm/upper_bound.hpp
View file

@ -1,34 +0,0 @@
/*=============================================================================
Copyright (c) 2011-2013 Bolero MURAKAMI
Copyright (C) 2011 RiSK (sscrisk)
https://github.com/bolero-MURAKAMI/Sprout
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
#ifndef SPROUT_DETAIL_ALGORITHM_UPPER_BOUND_HPP
#define SPROUT_DETAIL_ALGORITHM_UPPER_BOUND_HPP
#include <iterator>
#include <sprout/config.hpp>
#include <sprout/iterator/next.hpp>
namespace sprout {
namespace detail {
template<typename ForwardIterator, typename T, typename Compare>
inline SPROUT_CONSTEXPR ForwardIterator
upper_bound(
ForwardIterator first, typename std::iterator_traits<ForwardIterator>::difference_type len,
T const& value, Compare comp
)
{
return len == 0 ? first
: comp(value, *sprout::next(first, len / 2))
? sprout::detail::upper_bound(first, len / 2, value, comp)
: sprout::detail::upper_bound(sprout::next(first, len / 2 + 1), len - (len / 2 + 1), value, comp)
;
}
} // namespace detail
} // namespace sprout
#endif // #ifndef SPROUT_DETAIL_ALGORITHM_UPPER_BOUND_HPP