mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2025-07-18 15:24:11 +00:00
algorithm, operation 全面修正
This commit is contained in:
parent
21f5d5191a
commit
5e67195030
244 changed files with 4764 additions and 831 deletions
|
@ -4,6 +4,7 @@
|
|||
#include <sprout/config.hpp>
|
||||
#include <sprout/fixed_container/traits.hpp>
|
||||
#include <sprout/fixed_container/functions.hpp>
|
||||
#include <sprout/algorithm/fixed/result_of.hpp>
|
||||
#include <sprout/algorithm/fixed/merge.hpp>
|
||||
|
||||
namespace sprout {
|
||||
|
@ -12,7 +13,7 @@ namespace sprout {
|
|||
// inplace_merge
|
||||
//
|
||||
template<typename Container, typename Compare>
|
||||
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type inplace_merge(
|
||||
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type inplace_merge(
|
||||
Container const& cont,
|
||||
typename sprout::fixed_container_traits<Container>::const_iterator middle,
|
||||
Compare comp
|
||||
|
@ -31,7 +32,7 @@ namespace sprout {
|
|||
// inplace_merge
|
||||
//
|
||||
template<typename Container>
|
||||
SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits<Container>::fixed_container_type inplace_merge(
|
||||
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm<Container>::type inplace_merge(
|
||||
Container const& cont,
|
||||
typename sprout::fixed_container_traits<Container>::const_iterator middle
|
||||
)
|
||||
|
@ -45,6 +46,8 @@ namespace sprout {
|
|||
);
|
||||
}
|
||||
} // namespace fixed
|
||||
|
||||
using sprout::fixed::inplace_merge;
|
||||
} // namespace sprout
|
||||
|
||||
#endif // #ifndef SPROUT_ALGORITHM_FIXED_INPLACE_MERGE_HPP
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue