mirror of
https://github.com/bolero-MURAKAMI/Sprout.git
synced 2024-12-23 21:25:49 +00:00
fix aligned_union_t
This commit is contained in:
parent
6ae41ef6de
commit
6f8213b7cc
1 changed files with 8 additions and 9 deletions
|
@ -76,9 +76,10 @@ namespace sprout {
|
||||||
std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
|
std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
|
||||||
>
|
>
|
||||||
using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
|
using aligned_storage_t = typename std::aligned_storage<Len, Align>::type;
|
||||||
// ???
|
#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
|
||||||
//template<std::size_t Len, typename... Types>
|
template<std::size_t Len, typename... Types>
|
||||||
//using aligned_union_t = typename std::aligned_union<Len, Types...>::type;
|
using aligned_union_t = typename std::aligned_union<Len, Types...>::type;
|
||||||
|
#endif
|
||||||
template<typename T>
|
template<typename T>
|
||||||
using decay_t = typename std::decay<T>::type;
|
using decay_t = typename std::decay<T>::type;
|
||||||
template<bool B, typename T = void>
|
template<bool B, typename T = void>
|
||||||
|
@ -151,9 +152,10 @@ namespace sprout {
|
||||||
std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
|
std::size_t Align = std::alignment_of<typename std::aligned_storage<Len>::type>::value
|
||||||
>
|
>
|
||||||
using aligned_storage = sprout::aligned_storage_t<Len, Align>;
|
using aligned_storage = sprout::aligned_storage_t<Len, Align>;
|
||||||
// ???
|
#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
|
||||||
//template<std::size_t Len, typename... Types>
|
template<std::size_t Len, typename... Types>
|
||||||
//using aligned_union = sprout::aligned_union_t<Len, Types...>;
|
using aligned_union = sprout::aligned_union_t<Len, Types...>;
|
||||||
|
#endif
|
||||||
template<typename T>
|
template<typename T>
|
||||||
using decay = sprout::decay_t<T>;
|
using decay = sprout::decay_t<T>;
|
||||||
template<bool B, typename T = void>
|
template<bool B, typename T = void>
|
||||||
|
@ -164,9 +166,6 @@ namespace sprout {
|
||||||
using common_type = sprout::common_type_t<Types...>;
|
using common_type = sprout::common_type_t<Types...>;
|
||||||
template<typename T>
|
template<typename T>
|
||||||
using underlying_type = sprout::underlying_type_t<T>;
|
using underlying_type = sprout::underlying_type_t<T>;
|
||||||
// ???
|
|
||||||
//template<typename F, typename... ArgTypes>
|
|
||||||
//using result_of = sprout::result_of_t<F, ArgTypes...>;
|
|
||||||
#endif // #if SPROUT_USE_TEMPLATE_ALIASES
|
#endif // #if SPROUT_USE_TEMPLATE_ALIASES
|
||||||
} // namespace sprout
|
} // namespace sprout
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue