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

28
sprout/algorithm/fixed/swap_element_copy.hpp
View file

@ -5,8 +5,8 @@
#include <type_traits>
#include <sprout/config.hpp>
#include <sprout/index_tuple.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/iterator/operation.hpp>
#include <sprout/algorithm/fixed/result_of.hpp>
#include <sprout/detail/container_complate.hpp>
@ -23,12 +23,12 @@ namespace sprout {
RandomAccessIterator pos1,
RandomAccessIterator pos2,
sprout::index_tuple<Indexes...>,
typename sprout::fixed_container_traits<Result>::difference_type offset,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::fixed_container_traits<Result>::size_type input_size
typename sprout::container_traits<Result>::difference_type offset,
typename sprout::container_traits<Result>::size_type size,
typename sprout::container_traits<Result>::size_type input_size
)
{
return sprout::remake_clone<Result>(
return sprout::remake<Result>(
result,
sprout::size(result),
(Indexes >= offset && Indexes < offset + size && Indexes < offset + input_size
@ -37,7 +37,7 @@ namespace sprout {
: sprout::next(first, Indexes - offset) == pos2
? *pos1
: *sprout::next(first, Indexes - offset)
: *sprout::next(sprout::fixed_begin(result), Indexes)
: *sprout::next(sprout::internal_begin(result), Indexes)
)...
);
}
@ -57,15 +57,15 @@ namespace sprout {
result,
pos1,
pos2,
typename sprout::index_range<0, sprout::fixed_container_traits<Result>::fixed_size>::type(),
sprout::fixed_begin_offset(result),
typename sprout::index_range<0, sprout::container_traits<Result>::static_size>::type(),
sprout::internal_begin_offset(result),
sprout::size(result),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(first, last)
);
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size == sizeof...(Args),
sprout::container_traits<Result>::static_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type swap_element_copy_impl(
InputIterator first,
@ -73,15 +73,15 @@ namespace sprout {
Result const& result,
InputIterator pos1,
InputIterator pos2,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::container_traits<Result>::size_type size,
Args const&... args
)
{
return sprout::remake_clone<Result>(result, sprout::size(result), args...);
return sprout::remake<Result>(result, sprout::size(result), args...);
}
template<typename InputIterator, typename Result, typename... Args>
SPROUT_CONSTEXPR inline typename std::enable_if<
sprout::fixed_container_traits<Result>::fixed_size != sizeof...(Args),
sprout::container_traits<Result>::static_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type swap_element_copy_impl(
InputIterator first,
@ -89,7 +89,7 @@ namespace sprout {
Result const& result,
InputIterator pos1,
InputIterator pos2,
typename sprout::fixed_container_traits<Result>::size_type size,
typename sprout::container_traits<Result>::size_type size,
Args const&... args
)
{