mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-16 15:14:13 +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

8
sprout/algorithm/fixed/inplace_merge.hpp
View file

@ -2,8 +2,8 @@
#define SPROUT_ALGORITHM_FIXED_INPLACE_MERGE_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/algorithm/fixed/result_of.hpp>
#include <sprout/algorithm/fixed/merge.hpp>
@ -15,7 +15,7 @@ namespace sprout {
template<typename Container, typename Compare>
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,
typename sprout::container_traits<Container>::const_iterator middle,
Compare comp
)
{
@ -34,7 +34,7 @@ namespace sprout {
template<typename Container>
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
typename sprout::container_traits<Container>::const_iterator middle
)
{
return sprout::fixed::merge(