mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-16 15:14:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix optional

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-03-31 10:09:02 +09:00
parent a1c119a9bb
commit 6a78f64feb
9 changed files with 233 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sprout/tuple/tuple/flexibly_construct.hpp → sprout/tuple/flexibly_construct.hpp
View file

@ -1,5 +1,5 @@
#ifndef SPROUT_TUPLE_TUPLE_FREXIBLY_CONSTRUCT_HPP
#define SPROUT_TUPLE_TUPLE_FREXIBLY_CONSTRUCT_HPP
#ifndef SPROUT_TUPLE_FREXIBLY_CONSTRUCT_HPP
#define SPROUT_TUPLE_FREXIBLY_CONSTRUCT_HPP
#include <sprout/config.hpp>
@ -17,4 +17,4 @@ namespace sprout {
using sprout::tuples::flexibly_construct;
} // namespace sprout
#endif // #ifndef SPROUT_TUPLE_TUPLE_FREXIBLY_CONSTRUCT_HPP
#endif // #ifndef SPROUT_TUPLE_FREXIBLY_CONSTRUCT_HPP

2
sprout/tuple/tuple.hpp
View file

@ -11,6 +11,6 @@
#include <sprout/tuple/tuple/ignore.hpp>
#include <sprout/tuple/tuple/make_tuple.hpp>
#include <sprout/tuple/tuple/type_traits.hpp>
#include <sprout/tuple/tuple/flexibly_construct.hpp>
#include <sprout/tuple/flexibly_construct.hpp>
#endif // #ifndef SPROUT_TUPLE_TUPLE_HPP

3
sprout/tuple/tuple/tuple.hpp
View file

@ -11,7 +11,7 @@
#include <sprout/type_traits/is_convert_constructible.hpp>
#include <sprout/tpp/algorithm/all_of.hpp>
#include <sprout/tuple/tuple/tuple_decl.hpp>
#include <sprout/tuple/tuple/flexibly_construct.hpp>
#include <sprout/tuple/flexibly_construct.hpp>
namespace sprout {
namespace tuples {
@ -71,6 +71,7 @@ namespace sprout {
inline SPROUT_CONSTEXPR sprout::tuples::tuple<Types...>::tuple(sprout::pair<UTypes...>&& t)
: impl_type(sprout::forward<typename sprout::pair<UTypes...>::first_type>(t.first), sprout::forward<typename sprout::pair<UTypes...>::second_type>(t.second))
{}
template<typename... Types>
template<
typename... UTypes,

29
sprout/tuple/tuple/tuple_decl.hpp
View file

@ -15,7 +15,7 @@
#include <sprout/type_traits/is_convert_constructible.hpp>
#include <sprout/tpp/algorithm/all_of.hpp>
#include <sprout/tuple/tuple/tuple_fwd.hpp>
#include <sprout/tuple/tuple/flexibly_construct.hpp>
#include <sprout/tuple/flexibly_construct.hpp>
namespace sprout {
namespace tuples {
@ -245,9 +245,9 @@ namespace sprout {
typedef sprout::tuples::detail::tuple_impl<0, Types...> impl_type;
private:
template<typename TndexTuple, typename... Utypes>
struct is_flexibly_constructible_impl;
struct is_flexibly_convert_constructible_impl;
template<sprout::index_t... Indexes, typename... Utypes>
struct is_flexibly_constructible_impl<sprout::index_tuple<Indexes...>, Utypes...>
struct is_flexibly_convert_constructible_impl<sprout::index_tuple<Indexes...>, Utypes...>
: public sprout::tpp::all_of<
sprout::is_convert_constructible<
typename sprout::tppack_at<Indexes, Types...>::type,
@ -262,19 +262,19 @@ namespace sprout {
>
{};
template<typename... UTypes>
struct is_flexibly_constructible
: public is_flexibly_constructible_impl<
struct is_flexibly_convert_constructible
: public is_flexibly_convert_constructible_impl<
typename sprout::index_range<0, (sizeof...(UTypes) < sizeof...(Types) ? sizeof...(UTypes) : sizeof...(Types))>::type,
UTypes...
>
{};
template<typename... UTypes>
struct is_rvref_flexibly_constructible
: public is_flexibly_constructible<UTypes&&...>
struct is_rvref_flexibly_convert_constructible
: public is_flexibly_convert_constructible<UTypes&&...>
{};
template<typename... UTypes>
struct is_clvref_flexibly_constructible
: public is_flexibly_constructible<UTypes const&...>
struct is_clvref_flexibly_convert_constructible
: public is_flexibly_convert_constructible<UTypes const&...>
{};
public:
// tuple construction
@ -317,38 +317,39 @@ namespace sprout {
>::type
>
SPROUT_CONSTEXPR tuple(sprout::pair<UTypes...>&& t);
template<
typename... UTypes,
typename = typename std::enable_if<
is_rvref_flexibly_constructible<UTypes...>::value
is_rvref_flexibly_convert_constructible<UTypes...>::value
>::type
>
explicit SPROUT_CONSTEXPR tuple(sprout::tuples::flexibly_construct_t, UTypes&&... elements);
template<
typename... UTypes,
typename = typename std::enable_if<
is_clvref_flexibly_constructible<UTypes...>::value
is_clvref_flexibly_convert_constructible<UTypes...>::value
>::type
>
SPROUT_CONSTEXPR tuple(sprout::tuples::flexibly_construct_t, sprout::tuples::tuple<UTypes...> const& t);
template<
typename... UTypes,
typename = typename std::enable_if<
is_rvref_flexibly_constructible<UTypes...>::value
is_rvref_flexibly_convert_constructible<UTypes...>::value
>::type
>
SPROUT_CONSTEXPR tuple(sprout::tuples::flexibly_construct_t, sprout::tuples::tuple<UTypes...>&& t);
template<
typename... UTypes,
typename = typename std::enable_if<
is_clvref_flexibly_constructible<UTypes...>::value
is_clvref_flexibly_convert_constructible<UTypes...>::value
>::type
>
SPROUT_CONSTEXPR tuple(sprout::tuples::flexibly_construct_t, sprout::pair<UTypes...> const& t);
template<
typename... UTypes,
typename = typename std::enable_if<
is_rvref_flexibly_constructible<UTypes...>::value
is_rvref_flexibly_convert_constructible<UTypes...>::value
>::type
>
SPROUT_CONSTEXPR tuple(sprout::tuples::flexibly_construct_t, sprout::pair<UTypes...>&& t);