fix container_traits for array-like classes

fix coding style algorithm/
This commit is contained in:
bolero-MURAKAMI 2012-09-29 17:10:46 +09:00
parent 06f1933220
commit 0c00166c5f
123 changed files with 1608 additions and 2224 deletions

View file

@ -9,6 +9,7 @@
#include <sprout/container/functions.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/algorithm/fixed/result_of.hpp>
#include <sprout/math/comparison.hpp>
#include <sprout/detail/container_complate.hpp>
#include HDR_ITERATOR_SSCRISK_CEL_OR_SPROUT
@ -16,10 +17,9 @@ namespace sprout {
namespace fixed {
namespace detail {
template<typename RandomAccessIterator, typename Result, sprout::index_t... Indexes>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type copy_impl_ra(
RandomAccessIterator first,
RandomAccessIterator last,
Result const& result,
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
copy_impl_ra(
RandomAccessIterator first, RandomAccessIterator last, Result const& result,
sprout::index_tuple<Indexes...>,
typename sprout::container_traits<Result>::difference_type offset,
typename sprout::container_traits<Result>::size_type size,
@ -29,24 +29,21 @@ namespace sprout {
return sprout::remake<Result>(
result,
sprout::size(result),
(Indexes >= offset && Indexes < offset + size && Indexes < offset + input_size
(Indexes >= offset && sprout::math::less(Indexes, offset + size) && sprout::math::less(Indexes, offset + input_size)
? first[Indexes - offset]
: *sprout::next(sprout::internal_begin(result), Indexes)
)...
);
}
template<typename RandomAccessIterator, typename Result>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type copy(
RandomAccessIterator first,
RandomAccessIterator last,
Result const& result,
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
copy(
RandomAccessIterator first, RandomAccessIterator last, Result const& result,
std::random_access_iterator_tag*
)
{
return sprout::fixed::detail::copy_impl_ra(
first,
last,
result,
first, last, result,
sprout::index_range<0, sprout::container_traits<Result>::static_size>::make(),
sprout::internal_begin_offset(result),
sprout::size(result),
@ -57,10 +54,9 @@ namespace sprout {
inline SPROUT_CONSTEXPR typename std::enable_if<
sprout::container_traits<Result>::static_size == sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type copy_impl(
InputIterator first,
InputIterator last,
Result const& result,
>::type
copy_impl(
InputIterator first, InputIterator last, Result const& result,
typename sprout::container_traits<Result>::size_type size,
Args const&... args
)
@ -71,10 +67,9 @@ namespace sprout {
inline SPROUT_CONSTEXPR typename std::enable_if<
sprout::container_traits<Result>::static_size != sizeof...(Args),
typename sprout::fixed::result_of::algorithm<Result>::type
>::type copy_impl(
InputIterator first,
InputIterator last,
Result const& result,
>::type
copy_impl(
InputIterator first, InputIterator last, Result const& result,
typename sprout::container_traits<Result>::size_type size,
Args const&... args
)
@ -85,10 +80,9 @@ namespace sprout {
;
}
template<typename InputIterator, typename Result>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type copy(
InputIterator first,
InputIterator last,
Result const& result,
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
copy(
InputIterator first, InputIterator last, Result const& result,
void*
)
{
@ -99,12 +93,8 @@ namespace sprout {
// copy
//
template<typename InputIterator, typename Result>
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type copy(
InputIterator first,
InputIterator last,
Result const& result
)
{
inline SPROUT_CONSTEXPR typename sprout::fixed::result_of::algorithm<Result>::type
copy(InputIterator first, InputIterator last, Result const& result) {
typedef typename std::iterator_traits<InputIterator>::iterator_category* category;
return sprout::fixed::detail::copy(first, last, result, category());
}