From d5dcbaf4b210b1ba6b4ff04a40959a96132193b2 Mon Sep 17 00:00:00 2001 From: bolero-MURAKAMI Date: Tue, 28 Feb 2012 10:46:39 +0900 Subject: [PATCH] =?UTF-8?q?sprout::index=5Ft=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sprout/algorithm/fixed/copy.hpp | 3 +- sprout/algorithm/fixed/copy_backward.hpp | 2 +- sprout/algorithm/fixed/fill.hpp | 3 +- sprout/algorithm/fixed/replace_copy.hpp | 3 +- sprout/algorithm/fixed/replace_copy_if.hpp | 3 +- sprout/algorithm/fixed/reverse_copy.hpp | 3 +- sprout/algorithm/fixed/rotate_copy.hpp | 3 +- sprout/algorithm/fixed/shuffle.hpp | 4 +-- sprout/algorithm/fixed/shuffle_result.hpp | 4 +-- sprout/algorithm/fixed/swap_element_copy.hpp | 3 +- sprout/algorithm/fixed/transform.hpp | 5 ++-- sprout/array.hpp | 2 +- sprout/breed/detail/deduce_domain.hpp | 2 +- sprout/breed/generate.hpp | 4 +-- sprout/breed/transform/pass_through.hpp | 5 ++-- sprout/darkroom/pixels/generate.hpp | 4 +-- sprout/functional/dft/fixed/dft.hpp | 3 +- sprout/functional/dft/fixed/idft.hpp | 3 +- sprout/functional/fft/fixed/bitrev_table.hpp | 2 +- sprout/index_tuple.hpp | 31 ++++++++++++-------- sprout/numeric/fixed/iota.hpp | 3 +- sprout/operation/fixed/append.hpp | 3 +- sprout/operation/fixed/erase.hpp | 3 +- sprout/operation/fixed/erase_n.hpp | 2 +- sprout/operation/fixed/insert.hpp | 3 +- sprout/operation/fixed/insert_n.hpp | 2 +- sprout/operation/fixed/realign.hpp | 5 ++-- sprout/operation/fixed/resize.hpp | 4 +-- sprout/operation/fixed/resize_backward.hpp | 4 +-- sprout/operation/fixed/set.hpp | 3 +- sprout/string.hpp | 12 ++++---- sprout/sub_array.hpp | 8 ++--- sprout/tuple/algorithm/copy.hpp | 3 +- sprout/tuple/operation/append_back.hpp | 3 +- sprout/tuple/operation/append_front.hpp | 3 +- sprout/tuple/operation/push_back.hpp | 3 +- sprout/tuple/operation/push_front.hpp | 3 +- sprout/type/operation/append_back.hpp | 3 +- sprout/type/operation/append_front.hpp | 3 +- sprout/type/operation/push_back.hpp | 3 +- sprout/type/operation/push_front.hpp | 3 +- sprout/type/string/to_string.hpp | 4 +-- sprout/type/string/to_string_constant.hpp | 4 +-- sprout/variant/variant.hpp | 2 +- 44 files changed, 80 insertions(+), 101 deletions(-) diff --git a/sprout/algorithm/fixed/copy.hpp b/sprout/algorithm/fixed/copy.hpp index 2bf191e2..032a1f0c 100644 --- a/sprout/algorithm/fixed/copy.hpp +++ b/sprout/algorithm/fixed/copy.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_COPY_HPP #define SPROUT_ALGORITHM_FIXED_COPY_HPP -#include #include #include #include @@ -16,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type copy_impl_ra( RandomAccessIterator first, RandomAccessIterator last, diff --git a/sprout/algorithm/fixed/copy_backward.hpp b/sprout/algorithm/fixed/copy_backward.hpp index f235a706..c4a1c80e 100644 --- a/sprout/algorithm/fixed/copy_backward.hpp +++ b/sprout/algorithm/fixed/copy_backward.hpp @@ -16,7 +16,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type copy_backward_impl_ra( RandomAccessIterator first, RandomAccessIterator last, diff --git a/sprout/algorithm/fixed/fill.hpp b/sprout/algorithm/fixed/fill.hpp index f7fe6d2f..2bdd60b7 100644 --- a/sprout/algorithm/fixed/fill.hpp +++ b/sprout/algorithm/fixed/fill.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_FILL_HPP #define SPROUT_ALGORITHM_FIXED_FILL_HPP -#include #include #include #include @@ -12,7 +11,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type fill_impl( Container const& cont, T const& value, diff --git a/sprout/algorithm/fixed/replace_copy.hpp b/sprout/algorithm/fixed/replace_copy.hpp index ecc01963..e7468f71 100644 --- a/sprout/algorithm/fixed/replace_copy.hpp +++ b/sprout/algorithm/fixed/replace_copy.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_REPLACE_COPY_HPP #define SPROUT_ALGORITHM_FIXED_REPLACE_COPY_HPP -#include #include #include #include @@ -17,7 +16,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type replace_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator last, diff --git a/sprout/algorithm/fixed/replace_copy_if.hpp b/sprout/algorithm/fixed/replace_copy_if.hpp index e880822d..e43b2cc7 100644 --- a/sprout/algorithm/fixed/replace_copy_if.hpp +++ b/sprout/algorithm/fixed/replace_copy_if.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_REPLACE_COPY_IF_HPP #define SPROUT_ALGORITHM_FIXED_REPLACE_COPY_IF_HPP -#include #include #include #include @@ -16,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type replace_copy_if_impl_ra( RandomAccessIterator first, RandomAccessIterator last, diff --git a/sprout/algorithm/fixed/reverse_copy.hpp b/sprout/algorithm/fixed/reverse_copy.hpp index 7bdfd1b1..d09a9d72 100644 --- a/sprout/algorithm/fixed/reverse_copy.hpp +++ b/sprout/algorithm/fixed/reverse_copy.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_REVERSE_COPY_HPP #define SPROUT_ALGORITHM_FIXED_REVERSE_COPY_HPP -#include #include #include #include @@ -16,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type reverse_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator last, diff --git a/sprout/algorithm/fixed/rotate_copy.hpp b/sprout/algorithm/fixed/rotate_copy.hpp index 5563b4c1..b44f5410 100644 --- a/sprout/algorithm/fixed/rotate_copy.hpp +++ b/sprout/algorithm/fixed/rotate_copy.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_ROTATE_COPY_HPP #define SPROUT_ALGORITHM_FIXED_ROTATE_COPY_HPP -#include #include #include #include @@ -16,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type rotate_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator middle, diff --git a/sprout/algorithm/fixed/shuffle.hpp b/sprout/algorithm/fixed/shuffle.hpp index 319b53f8..a2d2f9e2 100644 --- a/sprout/algorithm/fixed/shuffle.hpp +++ b/sprout/algorithm/fixed/shuffle.hpp @@ -54,7 +54,7 @@ namespace sprout { : sprout::array{{}} ; } - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type shuffle_impl_1( Container const& cont, sprout::index_tuple, @@ -72,7 +72,7 @@ namespace sprout { )... ); } - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type shuffle_impl( Container const& cont, sprout::index_tuple indexes, diff --git a/sprout/algorithm/fixed/shuffle_result.hpp b/sprout/algorithm/fixed/shuffle_result.hpp index 520edfc2..bd666985 100644 --- a/sprout/algorithm/fixed/shuffle_result.hpp +++ b/sprout/algorithm/fixed/shuffle_result.hpp @@ -74,7 +74,7 @@ namespace sprout { ) ; } - template + template SPROUT_CONSTEXPR inline sprout::tuples::tuple< typename sprout::fixed::result_of::algorithm::type, typename std::decay::type @@ -102,7 +102,7 @@ namespace sprout { sprout::tuples::get<1>(shuffled) ); } - template + template SPROUT_CONSTEXPR inline sprout::tuples::tuple< typename sprout::fixed::result_of::algorithm::type, typename std::decay::type diff --git a/sprout/algorithm/fixed/swap_element_copy.hpp b/sprout/algorithm/fixed/swap_element_copy.hpp index 5fc3a233..6ac8115c 100644 --- a/sprout/algorithm/fixed/swap_element_copy.hpp +++ b/sprout/algorithm/fixed/swap_element_copy.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_SWAP_ELEMENT_COPY_HPP #define SPROUT_ALGORITHM_FIXED_SWAP_ELEMENT_COPY_HPP -#include #include #include #include @@ -16,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type swap_element_copy_impl_ra( RandomAccessIterator first, RandomAccessIterator last, diff --git a/sprout/algorithm/fixed/transform.hpp b/sprout/algorithm/fixed/transform.hpp index 3b4c6c08..80ff1fee 100644 --- a/sprout/algorithm/fixed/transform.hpp +++ b/sprout/algorithm/fixed/transform.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_ALGORITHM_FIXED_TRANSFORM_HPP #define SPROUT_ALGORITHM_FIXED_TRANSFORM_HPP -#include #include #include #include @@ -16,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type transform_impl_ra( RandomAccessIterator first, RandomAccessIterator last, @@ -118,7 +117,7 @@ namespace sprout { } namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type transform_impl_ra( RandomAccessIterator1 first1, RandomAccessIterator1 last1, diff --git a/sprout/array.hpp b/sprout/array.hpp index 03a12c9a..76763c10 100644 --- a/sprout/array.hpp +++ b/sprout/array.hpp @@ -260,7 +260,7 @@ namespace sprout { } namespace detail { - template + template SPROUT_CONSTEXPR inline sprout::array to_array_impl( T const (& arr)[N], sprout::index_tuple diff --git a/sprout/breed/detail/deduce_domain.hpp b/sprout/breed/detail/deduce_domain.hpp index 3ad3ebff..b34db935 100644 --- a/sprout/breed/detail/deduce_domain.hpp +++ b/sprout/breed/detail/deduce_domain.hpp @@ -203,7 +203,7 @@ namespace sprout { template struct deduce_domain_impl; - template + template struct deduce_domain_impl, Args...> : public sprout::breed::detail::common_domain< typename sprout::breed::domain_of< diff --git a/sprout/breed/generate.hpp b/sprout/breed/generate.hpp index aadbc95a..8d9113b1 100644 --- a/sprout/breed/generate.hpp +++ b/sprout/breed/generate.hpp @@ -49,7 +49,7 @@ namespace sprout { typedef sprout::breed::expr src_type; typedef sprout::breed::expr type; private: - template + template static SPROUT_CONSTEXPR type call_impl(src_type const& e, sprout::index_tuple) { return type(e.template child()...); } @@ -68,7 +68,7 @@ namespace sprout { typedef sprout::breed::basic_expr src_type; typedef sprout::breed::basic_expr type; private: - template + template static SPROUT_CONSTEXPR type call_impl(src_type const& e, sprout::index_tuple) { return type(e.template child()...); } diff --git a/sprout/breed/transform/pass_through.hpp b/sprout/breed/transform/pass_through.hpp index b0459e9b..3c4a032c 100644 --- a/sprout/breed/transform/pass_through.hpp +++ b/sprout/breed/transform/pass_through.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_BREED_TRANSFORM_PASS_THROUGH_HPP #define SPROUT_BREED_TRANSFORM_PASS_THROUGH_HPP -#include #include #include #include @@ -28,7 +27,7 @@ namespace sprout { private: template struct list_impl {}; - template + template struct list_impl > { public: typedef sprout::breed::list< @@ -50,7 +49,7 @@ namespace sprout { breed_generator(expr_type) >::type result_type; private: - template + template SPROUT_CONSTEXPR result_type call_impl( typename pass_through_impl::expr_param e, typename pass_through_impl::state_param s, diff --git a/sprout/darkroom/pixels/generate.hpp b/sprout/darkroom/pixels/generate.hpp index ef8dd666..2520e3a4 100644 --- a/sprout/darkroom/pixels/generate.hpp +++ b/sprout/darkroom/pixels/generate.hpp @@ -23,7 +23,7 @@ namespace sprout { typename Camera, typename Objects, typename Lights, - std::ptrdiff_t... XIndexes + sprout::index_t... XIndexes > SPROUT_CONSTEXPR inline typename sprout::fixed_container_traits::value_type generate_impl_line( @@ -71,7 +71,7 @@ namespace sprout { typename Camera, typename Objects, typename Lights, - std::ptrdiff_t... YIndexes + sprout::index_t... YIndexes > SPROUT_CONSTEXPR inline Pixels generate_impl( diff --git a/sprout/functional/dft/fixed/dft.hpp b/sprout/functional/dft/fixed/dft.hpp index 0d1f4525..ac14364e 100644 --- a/sprout/functional/dft/fixed/dft.hpp +++ b/sprout/functional/dft/fixed/dft.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_FUNCTIONAL_DFT_FIXED_DFT_HPP #define SPROUT_FUNCTIONAL_DFT_FIXED_DFT_HPP -#include #include #include #include @@ -14,7 +13,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type dft_impl( InputIterator first, InputIterator last, diff --git a/sprout/functional/dft/fixed/idft.hpp b/sprout/functional/dft/fixed/idft.hpp index db90b584..8a4a46d8 100644 --- a/sprout/functional/dft/fixed/idft.hpp +++ b/sprout/functional/dft/fixed/idft.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_FUNCTIONAL_DFT_FIXED_IDFT_HPP #define SPROUT_FUNCTIONAL_DFT_FIXED_IDFT_HPP -#include #include #include #include @@ -14,7 +13,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type idft_impl( InputIterator first, InputIterator last, diff --git a/sprout/functional/fft/fixed/bitrev_table.hpp b/sprout/functional/fft/fixed/bitrev_table.hpp index 80e6ae21..52f27abd 100644 --- a/sprout/functional/fft/fixed/bitrev_table.hpp +++ b/sprout/functional/fft/fixed/bitrev_table.hpp @@ -15,7 +15,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type bitrev_table_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/index_tuple.hpp b/sprout/index_tuple.hpp index e9550df2..ca0a1142 100644 --- a/sprout/index_tuple.hpp +++ b/sprout/index_tuple.hpp @@ -5,19 +5,24 @@ #include namespace sprout { + // + // index_t + // + typedef std::ptrdiff_t index_t; + // // index_tuple // - template + template struct index_tuple {}; // // index_range // template< - std::ptrdiff_t First, - std::ptrdiff_t Last, - std::ptrdiff_t Step = 1, + sprout::index_t First, + sprout::index_t Last, + sprout::index_t Step = 1, typename Acc = sprout::index_tuple<>, bool Break = (First >= Last) > @@ -25,10 +30,10 @@ namespace sprout { typedef Acc type; }; template< - std::ptrdiff_t First, - std::ptrdiff_t Last, - std::ptrdiff_t Step, - std::ptrdiff_t... Indexes + sprout::index_t First, + sprout::index_t Last, + sprout::index_t Step, + sprout::index_t... Indexes > struct index_range, false> : public sprout::index_range > @@ -38,8 +43,8 @@ namespace sprout { // index_n // template< - std::ptrdiff_t I, - std::ptrdiff_t N, + sprout::index_t I, + sprout::index_t N, typename Acc = sprout::index_tuple<>, bool Break = (N == 0) > @@ -47,9 +52,9 @@ namespace sprout { typedef Acc type; }; template< - std::ptrdiff_t I, - std::ptrdiff_t N, - std::ptrdiff_t... Indexes + sprout::index_t I, + sprout::index_t N, + sprout::index_t... Indexes > struct index_n, false> : public sprout::index_n > diff --git a/sprout/numeric/fixed/iota.hpp b/sprout/numeric/fixed/iota.hpp index f47f5550..03a5cd12 100644 --- a/sprout/numeric/fixed/iota.hpp +++ b/sprout/numeric/fixed/iota.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_NUMERIC_FIXED_IOTA_HPP #define SPROUT_NUMERIC_FIXED_IOTA_HPP -#include #include #include #include @@ -12,7 +11,7 @@ namespace sprout { namespace fixed { namespace detail { - template + template SPROUT_CONSTEXPR inline typename sprout::fixed::result_of::algorithm::type iota_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/append.hpp b/sprout/operation/fixed/append.hpp index 3f00b028..94a31692 100644 --- a/sprout/operation/fixed/append.hpp +++ b/sprout/operation/fixed/append.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_OPERATION_FIXED_APPEND_HPP #define SPROUT_OPERATION_FIXED_APPEND_HPP -#include #include #include #include @@ -27,7 +26,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result append_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/erase.hpp b/sprout/operation/fixed/erase.hpp index f13c889e..3a110355 100644 --- a/sprout/operation/fixed/erase.hpp +++ b/sprout/operation/fixed/erase.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_OPERATION_FIXED_ERASE_HPP #define SPROUT_OPERATION_FIXED_ERASE_HPP -#include #include #include #include @@ -28,7 +27,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result erase_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/erase_n.hpp b/sprout/operation/fixed/erase_n.hpp index 2df92093..8e716c15 100644 --- a/sprout/operation/fixed/erase_n.hpp +++ b/sprout/operation/fixed/erase_n.hpp @@ -28,7 +28,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result erase_n_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/insert.hpp b/sprout/operation/fixed/insert.hpp index 5e59b4e1..5246ecc7 100644 --- a/sprout/operation/fixed/insert.hpp +++ b/sprout/operation/fixed/insert.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_OPERATION_FIXED_INSERT_HPP #define SPROUT_OPERATION_FIXED_INSERT_HPP -#include #include #include #include @@ -29,7 +28,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result insert_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/insert_n.hpp b/sprout/operation/fixed/insert_n.hpp index c0572ebd..058f1b8c 100644 --- a/sprout/operation/fixed/insert_n.hpp +++ b/sprout/operation/fixed/insert_n.hpp @@ -30,7 +30,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result insert_n_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/realign.hpp b/sprout/operation/fixed/realign.hpp index a4b59b69..18d87829 100644 --- a/sprout/operation/fixed/realign.hpp +++ b/sprout/operation/fixed/realign.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_OPERATION_FIXED_REALIGN_HPP #define SPROUT_OPERATION_FIXED_REALIGN_HPP -#include #include #include #include @@ -22,7 +21,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result realign_impl( Container const& cont, sprout::index_tuple, @@ -56,7 +55,7 @@ namespace sprout { } namespace detail { - template + template SPROUT_CONSTEXPR inline Result realign_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/resize.hpp b/sprout/operation/fixed/resize.hpp index 7d99ab13..c8b5cf4e 100644 --- a/sprout/operation/fixed/resize.hpp +++ b/sprout/operation/fixed/resize.hpp @@ -26,7 +26,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result resize_impl( Container const& cont, sprout::index_tuple, @@ -60,7 +60,7 @@ namespace sprout { } namespace detail { - template + template SPROUT_CONSTEXPR inline Result resize_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/resize_backward.hpp b/sprout/operation/fixed/resize_backward.hpp index 515a7b90..1dcffb65 100644 --- a/sprout/operation/fixed/resize_backward.hpp +++ b/sprout/operation/fixed/resize_backward.hpp @@ -22,7 +22,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result resize_backward_impl( Container const& cont, sprout::index_tuple, @@ -61,7 +61,7 @@ namespace sprout { } namespace detail { - template + template SPROUT_CONSTEXPR inline Result resize_backward_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/operation/fixed/set.hpp b/sprout/operation/fixed/set.hpp index f2a03879..c17feea2 100644 --- a/sprout/operation/fixed/set.hpp +++ b/sprout/operation/fixed/set.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_OPERATION_FIXED_SET_HPP #define SPROUT_OPERATION_FIXED_SET_HPP -#include #include #include #include @@ -23,7 +22,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result set_impl( Container const& cont, sprout::index_tuple, diff --git a/sprout/string.hpp b/sprout/string.hpp index 061fa3f5..50759617 100644 --- a/sprout/string.hpp +++ b/sprout/string.hpp @@ -215,7 +215,7 @@ namespace sprout { n2 ); } - template + template static SPROUT_CONSTEXPR basic_string from_c_str_impl( value_type const* s, size_type n, @@ -255,7 +255,7 @@ namespace sprout { ); } #endif - template + template static SPROUT_CONSTEXPR basic_string implicit_conversion_impl( T const(& elems)[M], size_type len, @@ -833,7 +833,7 @@ namespace sprout { // to_string // namespace detail { - template + template SPROUT_CONSTEXPR inline sprout::basic_string to_string_impl_1( T const(& arr)[N], typename sprout::basic_string::size_type n, @@ -842,7 +842,7 @@ namespace sprout { { return sprout::basic_string{{(Indexes < n ? arr[Indexes] : T())...}, n}; } - template + template SPROUT_CONSTEXPR inline sprout::basic_string to_string_impl( T const(& arr)[N], sprout::index_tuple @@ -872,7 +872,7 @@ namespace sprout { // make_string // namespace detail { - template + template SPROUT_CONSTEXPR inline sprout::basic_string make_string_impl_1( sprout::array const& arr, std::size_t n, @@ -881,7 +881,7 @@ namespace sprout { { return sprout::basic_string{{(Indexes < n ? arr[Indexes] : T())...}, n}; } - template + template SPROUT_CONSTEXPR inline sprout::basic_string make_string_impl( sprout::array const& arr, sprout::index_tuple diff --git a/sprout/sub_array.hpp b/sprout/sub_array.hpp index 1950d9cf..4ce986a2 100644 --- a/sprout/sub_array.hpp +++ b/sprout/sub_array.hpp @@ -128,7 +128,7 @@ namespace sprout { public: sub_array_impl() = default; protected: - template + template SPROUT_CONSTEXPR sub_array_impl( ContainerTag, param_type arr, @@ -141,7 +141,7 @@ namespace sprout { , first_(NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::cbegin(arr), first)) , last_(NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::cbegin(arr), last)) {} - template + template SPROUT_CONSTEXPR sub_array_impl( ContainerTag, param_type arr, @@ -154,7 +154,7 @@ namespace sprout { , first_(NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::cbegin(arr), first)) , last_(NS_SSCRISK_CEL_OR_SPROUT_DETAIL::distance(sprout::cbegin(arr), last)) {} - template + template SPROUT_CONSTEXPR sub_array_impl( ContainerTag, param_type arr, @@ -167,7 +167,7 @@ namespace sprout { , first_(first) , last_(last) {} - template + template SPROUT_CONSTEXPR sub_array_impl( ContainerTag, param_type arr, diff --git a/sprout/tuple/algorithm/copy.hpp b/sprout/tuple/algorithm/copy.hpp index 4ef367a2..5144ac57 100644 --- a/sprout/tuple/algorithm/copy.hpp +++ b/sprout/tuple/algorithm/copy.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TUPLE_ALGORITHM_COPY_HPP #define SPROUT_TUPLE_ALGORITHM_COPY_HPP -#include #include #include #include @@ -22,7 +21,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result copy_impl( Tuple const& t, InputTuple const& input, diff --git a/sprout/tuple/operation/append_back.hpp b/sprout/tuple/operation/append_back.hpp index d264fa3b..7db22e92 100644 --- a/sprout/tuple/operation/append_back.hpp +++ b/sprout/tuple/operation/append_back.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TUPLE_OPERATION_APPEND_BACK_HPP #define SPROUT_TUPLE_OPERATION_APPEND_BACK_HPP -#include #include #include #include @@ -21,7 +20,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result append_back_impl( Tuple const& t, InputTuple const& input, diff --git a/sprout/tuple/operation/append_front.hpp b/sprout/tuple/operation/append_front.hpp index de1e059a..123881b5 100644 --- a/sprout/tuple/operation/append_front.hpp +++ b/sprout/tuple/operation/append_front.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TUPLE_OPERATION_APPEND_FRONT_HPP #define SPROUT_TUPLE_OPERATION_APPEND_FRONT_HPP -#include #include #include #include @@ -21,7 +20,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result append_front_impl( Tuple const& t, InputTuple const& input, diff --git a/sprout/tuple/operation/push_back.hpp b/sprout/tuple/operation/push_back.hpp index 91c875e7..6a0329d9 100644 --- a/sprout/tuple/operation/push_back.hpp +++ b/sprout/tuple/operation/push_back.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TUPLE_OPERATION_PUSH_BACK_HPP #define SPROUT_TUPLE_OPERATION_PUSH_BACK_HPP -#include #include #include #include @@ -21,7 +20,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result push_back_impl( Tuple const& t, T const& v, diff --git a/sprout/tuple/operation/push_front.hpp b/sprout/tuple/operation/push_front.hpp index ae91ca92..4cdc00ad 100644 --- a/sprout/tuple/operation/push_front.hpp +++ b/sprout/tuple/operation/push_front.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TUPLE_OPERATION_PUSH_FRONT_HPP #define SPROUT_TUPLE_OPERATION_PUSH_FRONT_HPP -#include #include #include #include @@ -21,7 +20,7 @@ namespace sprout { } // namespace result_of namespace detail { - template + template SPROUT_CONSTEXPR inline Result push_front_impl( Tuple const& t, T const& v, diff --git a/sprout/type/operation/append_back.hpp b/sprout/type/operation/append_back.hpp index eacb67f2..076b512c 100644 --- a/sprout/type/operation/append_back.hpp +++ b/sprout/type/operation/append_back.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TYPE_OPERATION_APPEND_BACK_HPP #define SPROUT_TYPE_OPERATION_APPEND_BACK_HPP -#include #include #include #include @@ -17,7 +16,7 @@ namespace sprout { private: template struct apply_impl; - template + template struct apply_impl, sprout::index_tuple > : public sprout::types::rebind_types< Tuple diff --git a/sprout/type/operation/append_front.hpp b/sprout/type/operation/append_front.hpp index a59d0607..2e8ae3d4 100644 --- a/sprout/type/operation/append_front.hpp +++ b/sprout/type/operation/append_front.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TYPE_OPERATION_APPEND_FRONT_HPP #define SPROUT_TYPE_OPERATION_APPEND_FRONT_HPP -#include #include #include #include @@ -17,7 +16,7 @@ namespace sprout { private: template struct apply_impl; - template + template struct apply_impl, sprout::index_tuple > : public sprout::types::rebind_types< Tuple diff --git a/sprout/type/operation/push_back.hpp b/sprout/type/operation/push_back.hpp index 78e3ebba..37e4b3e6 100644 --- a/sprout/type/operation/push_back.hpp +++ b/sprout/type/operation/push_back.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TYPE_OPERATION_PUSH_BACK_HPP #define SPROUT_TYPE_OPERATION_PUSH_BACK_HPP -#include #include #include #include @@ -17,7 +16,7 @@ namespace sprout { private: template struct apply_impl; - template + template struct apply_impl > : public sprout::types::rebind_types< Tuple diff --git a/sprout/type/operation/push_front.hpp b/sprout/type/operation/push_front.hpp index 5e9ef938..59177793 100644 --- a/sprout/type/operation/push_front.hpp +++ b/sprout/type/operation/push_front.hpp @@ -1,7 +1,6 @@ #ifndef SPROUT_TYPE_OPERATION_PUSH_FRONT_HPP #define SPROUT_TYPE_OPERATION_PUSH_FRONT_HPP -#include #include #include #include @@ -17,7 +16,7 @@ namespace sprout { private: template struct apply_impl; - template + template struct apply_impl > : public sprout::types::rebind_types< Tuple diff --git a/sprout/type/string/to_string.hpp b/sprout/type/string/to_string.hpp index f6949d11..8240633c 100644 --- a/sprout/type/string/to_string.hpp +++ b/sprout/type/string/to_string.hpp @@ -1,9 +1,9 @@ #ifndef SPROUT_TYPE_STRING_TO_STRING_HPP #define SPROUT_TYPE_STRING_TO_STRING_HPP -#include #include #include +#include #include #include #include @@ -26,7 +26,7 @@ namespace sprout { private: template struct impl; - template + template struct impl > { public: typedef sprout::types::basic_string< diff --git a/sprout/type/string/to_string_constant.hpp b/sprout/type/string/to_string_constant.hpp index b9961287..e7d9e16c 100644 --- a/sprout/type/string/to_string_constant.hpp +++ b/sprout/type/string/to_string_constant.hpp @@ -1,8 +1,8 @@ #ifndef SPROUT_TYPE_STRING_TO_STRING_CONSTANT_HPP #define SPROUT_TYPE_STRING_TO_STRING_CONSTANT_HPP -#include #include +#include #include #include #include @@ -37,7 +37,7 @@ namespace sprout { >::type > {}; - template + template SPROUT_CONSTEXPR inline sprout::basic_string< typename Sequence::value_type, sprout::types::detail::str_length::value diff --git a/sprout/variant/variant.hpp b/sprout/variant/variant.hpp index e1f6151a..99087fec 100644 --- a/sprout/variant/variant.hpp +++ b/sprout/variant/variant.hpp @@ -21,7 +21,7 @@ namespace sprout { typedef sprout::tuples::tuple tuple_type;; typedef sprout::types::type_tuple::type...> uncvref_tuple_type;; private: - template + template static SPROUT_CONSTEXPR tuple_type init(T&& operand, sprout::index_tuple) { return sprout::tuples::make_clone( typename sprout::tuples::tuple_element::type()...,