add make_array, make_string variation (remove make_string_as)

This commit is contained in:
bolero-MURAKAMI 2016-04-03 21:00:55 +09:00
parent f0ec89c423
commit 478c21a300
5 changed files with 108 additions and 22 deletions

View file

@ -30,6 +30,11 @@ namespace sprout {
make_array(Types&&... args) {
return sprout::array<typename std::remove_cv<T>::type, sizeof...(Types)>{{T(SPROUT_FORWARD(Types, args))...}};
}
template<typename T, std::size_t N, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename std::remove_cv<T>::type, N>
make_array(Types&&... args) {
return sprout::array<typename std::remove_cv<T>::type, N>{{T(SPROUT_FORWARD(Types, args))...}};
}
template<sprout::detail::make_array_t = sprout::detail::make_array_in_common_elements, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, sizeof...(Types)>
make_array(Types&&... args) {
@ -37,6 +42,13 @@ namespace sprout {
typedef sprout::array<value_type, sizeof...(Types)> type;
return type{{value_type(SPROUT_FORWARD(Types, args))...}};
}
template<std::size_t N, sprout::detail::make_array_t = sprout::detail::make_array_in_common_elements, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, N>
make_array(Types&&... args) {
typedef typename sprout::common_decay<Types...>::type value_type;
typedef sprout::array<value_type, N> type;
return type{{value_type(SPROUT_FORWARD(Types, args))...}};
}
//
// make_array_without_narrowing
@ -46,6 +58,11 @@ namespace sprout {
make_array_without_narrowing(Types&&... args) {
return sprout::array<typename std::remove_cv<T>::type, sizeof...(Types)>{{SPROUT_FORWARD(Types, args)...}};
}
template<typename T, std::size_t N, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename std::remove_cv<T>::type, N>
make_array_without_narrowing(Types&&... args) {
return sprout::array<typename std::remove_cv<T>::type, N>{{SPROUT_FORWARD(Types, args)...}};
}
template<sprout::detail::make_array_t = sprout::detail::make_array_in_common_elements, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, sizeof...(Types)>
make_array_without_narrowing(Types&&... args) {
@ -53,6 +70,13 @@ namespace sprout {
typedef sprout::array<value_type, sizeof...(Types)> type;
return type{{SPROUT_FORWARD(Types, args)...}};
}
template<std::size_t N, sprout::detail::make_array_t = sprout::detail::make_array_in_common_elements, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, N>
make_array_without_narrowing(Types&&... args) {
typedef typename sprout::common_decay<Types...>::type value_type;
typedef sprout::array<value_type, N> type;
return type{{SPROUT_FORWARD(Types, args)...}};
}
//
// make_common_array
@ -62,6 +86,11 @@ namespace sprout {
make_common_array(Types&&... args) {
return sprout::make_array(SPROUT_FORWARD(Types, args)...);
}
template<std::size_t N, typename... Types>
inline SPROUT_CONSTEXPR sprout::array<typename sprout::common_decay<Types...>::type, N>
make_common_array(Types&&... args) {
return sprout::make_array<N>(SPROUT_FORWARD(Types, args)...);
}
//
// convert_array