1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2025-08-03 12:49:50 +00:00

[desuructive changes] container traits new interface [破壊的変更]

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

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/operation/fixed/insert.hpp>
#include <sprout/detail/param_at.hpp>
@ -21,10 +21,10 @@ namespace sprout {
template<std::size_t N, typename Container, typename T, typename... Values>
struct insert_n {
public:
typedef typename sprout::rebind_fixed_size<
typedef typename sprout::container_transform_traits<
Container
>::template apply<
sprout::fixed_container_traits<Container>::fixed_size + (1 + sizeof...(Values)) * N
>::template rebind_size<
sprout::container_traits<Container>::static_size + (1 + sizeof...(Values)) * N
>::type type;
};
} // namespace result_of
@ -34,22 +34,22 @@ namespace sprout {
SPROUT_CONSTEXPR inline Result insert_n_impl(
Container const& cont,
sprout::index_tuple<Indexes...>,
typename sprout::fixed_container_traits<Container>::difference_type pos,
typename sprout::container_traits<Container>::difference_type pos,
T const& v,
Values const&... values
)
{
return sprout::remake_clone<Result>(
return sprout::remake<Result>(
cont,
sprout::size(cont) + (1 + sizeof...(Values)) * N,
(Indexes < sprout::fixed_container_traits<Container>::fixed_size + (1 + sizeof...(Values)) * N
(Indexes < sprout::container_traits<Container>::static_size + (1 + sizeof...(Values)) * N
? (Indexes < pos
? *(sprout::fixed_begin(cont) + Indexes)
? *(sprout::internal_begin(cont) + Indexes)
: Indexes < pos + (1 + sizeof...(Values)) * N
? sprout::detail::param_at<typename sprout::fixed_container_traits<Result>::value_type>((Indexes - pos) % (1 + sizeof...(Values)), v, values...)
: *sprout::next(sprout::fixed_begin(cont), Indexes - (1 + sizeof...(Values)) * N)
? sprout::detail::param_at<typename sprout::container_traits<Result>::value_type>((Indexes - pos) % (1 + sizeof...(Values)), v, values...)
: *sprout::next(sprout::internal_begin(cont), Indexes - (1 + sizeof...(Values)) * N)
)
: typename sprout::fixed_container_traits<Result>::value_type()
: typename sprout::container_traits<Result>::value_type()
)...
);
}
@ -60,15 +60,15 @@ namespace sprout {
template<std::size_t N, typename Container, typename T, typename... Values>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type insert_n(
Container const& cont,
typename sprout::fixed_container_traits<Container>::const_iterator pos,
typename sprout::container_traits<Container>::const_iterator pos,
T const& v,
Values const&... values
)
{
return sprout::fixed::detail::insert_n_impl<N, typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type>(
cont,
typename sprout::index_range<0, sprout::fixed_container_traits<typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type>::fixed_size>::type(),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::fixed_begin(cont), pos),
typename sprout::index_range<0, sprout::container_traits<typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type>::static_size>::type(),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::internal_begin(cont), pos),
v,
values...
);
@ -79,15 +79,15 @@ namespace sprout {
template<std::size_t N, typename Container, typename T, typename... Values>
SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type insert_n(
Container const& cont,
typename sprout::fixed_container_traits<Container>::difference_type pos,
typename sprout::container_traits<Container>::difference_type pos,
T const& v,
Values const&... values
)
{
return sprout::fixed::detail::insert_n_impl<N, typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type>(
cont,
typename sprout::index_range<0, sprout::fixed_container_traits<typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type>::fixed_size>::type(),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::fixed_begin(cont), sprout::next(sprout::begin(cont), pos)),
typename sprout::index_range<0, sprout::container_traits<typename sprout::fixed::result_of::insert_n<N, Container, T, Values...>::type>::static_size>::type(),
NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::internal_begin(cont), sprout::next(sprout::begin(cont), pos)),
v,
values...
);