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

modify namespace result_of -> results

support C++14 type_traits
This commit is contained in:
bolero-MURAKAMI 2013-11-20 22:04:11 +09:00
parent d386893a74
commit bf0c7021cf
350 changed files with 2628 additions and 1912 deletions

View file

@ -46,7 +46,7 @@ namespace sprout {
return sprout::tuples::tuple<Types&...>(args...);
}
namespace result_of {
namespace results {
namespace detail {
template<typename... Tuples>
struct tuple_cat_impl;
@ -83,7 +83,7 @@ namespace sprout {
> type;
};
public:
typedef typename sprout::tuples::result_of::detail::tuple_cat_impl<
typedef typename sprout::tuples::results::detail::tuple_cat_impl<
typename make<
T, typename sprout::tuple_indexes<T>::type,
U, typename sprout::tuple_indexes<U>::type
@ -97,11 +97,11 @@ namespace sprout {
//
template<typename... Tuples>
struct tuple_cat
: public sprout::tuples::result_of::detail::tuple_cat_impl<
: public sprout::tuples::results::detail::tuple_cat_impl<
typename std::decay<Tuples>::type...
>
{};
} // namespace result_of
} // namespace results
namespace detail {
template<typename... Tuples>
@ -148,19 +148,19 @@ namespace sprout {
// tuple_cat
//
template<typename... Tuples>
inline SPROUT_CONSTEXPR typename sprout::tuples::result_of::tuple_cat<Tuples...>::type
inline SPROUT_CONSTEXPR typename sprout::tuples::results::tuple_cat<Tuples...>::type
tuple_cat(Tuples&&... tuples) {
return sprout::tuples::detail::tuple_cat_impl<
typename sprout::tuples::result_of::tuple_cat<Tuples...>::type,
typename sprout::tuples::results::tuple_cat<Tuples...>::type,
typename sprout::tuples::detail::tuple_cat_1st_indexes<Tuples...>::type,
Tuples...
>::call(sprout::forward<Tuples>(tuples)...);
}
} // namespace tuples
namespace result_of {
using sprout::tuples::result_of::tuple_cat;
} // namespace result_of
namespace results {
using sprout::tuples::results::tuple_cat;
} // namespace results
using sprout::tuples::make_tuple;
using sprout::tuples::forward_as_tuple;

View file

@ -13,6 +13,7 @@
#include <type_traits>
#include <tuple>
#include <sprout/config.hpp>
#include <sprout/detail/predef.hpp>
#include <sprout/index_tuple/metafunction.hpp>
#include <sprout/utility/forward.hpp>
#include <sprout/utility/move.hpp>
@ -187,7 +188,7 @@ namespace sprout {
, base_type(sprout::forward<UHead>(h))
{}
tuple_impl(tuple_impl const&) = default;
#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1))
#if SPROUT_GCC_BETWEEN(4, 8, 0, 4, 8, 2)
tuple_impl(tuple_impl&&) = default;
#else
SPROUT_CONSTEXPR tuple_impl(tuple_impl&& t)