mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-11-14 10:39:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

workaround for GCC4.8: remove non-trivial move ctor

Browse source
This commit is contained in:
bolero-MURAKAMI 2013-07-16 18:42:33 +09:00
parent d1d273a84a
commit 49243e6c94
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sprout/optional/optional.hpp
View file

@ -98,11 +98,15 @@ namespace sprout {
: init(v.init) : init(v.init)
, val(v.is_initialized() ? holder_type(*v) : holder_type()) , val(v.is_initialized() ? holder_type(*v) : holder_type())
{} {}
#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1))
SPROUT_CONSTEXPR optional(optional&&) = default;
#else
SPROUT_CONSTEXPR optional(optional&& v) SPROUT_CONSTEXPR optional(optional&& v)
SPROUT_NOEXCEPT_EXPR(std::is_nothrow_move_constructible<T>::value) SPROUT_NOEXCEPT_EXPR(std::is_nothrow_move_constructible<T>::value)
: init(v.init) : init(v.init)
, val(v.is_initialized() ? holder_type(sprout::move(get(v))) : holder_type()) , val(v.is_initialized() ? holder_type(sprout::move(get(v))) : holder_type())
{} {}
#endif
SPROUT_CONSTEXPR optional(T const& v) SPROUT_CONSTEXPR optional(T const& v)
: init(true) : init(true)
, val(v) , val(v)

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

@ -42,7 +42,7 @@ namespace sprout {
// : Head(v) // : Head(v)
// {} // {}
// template<typename UHead> // template<typename UHead>
// SPROUT_CONSTEXPR head_base(UHead&& v) // explicit SPROUT_CONSTEXPR head_base(UHead&& v)
// : Head(sprout::forward<UHead>(v)) // : Head(sprout::forward<UHead>(v))
// {} // {}
// }; // };
@ -65,7 +65,7 @@ namespace sprout {
: head_(v) : head_(v)
{} {}
template<typename UHead> template<typename UHead>
SPROUT_CONSTEXPR head_base(UHead&& v) explicit SPROUT_CONSTEXPR head_base(UHead&& v)
: head_(sprout::forward<UHead>(v)) : head_(sprout::forward<UHead>(v))
{} {}
}; };
@ -88,7 +88,7 @@ namespace sprout {
: head_(v) : head_(v)
{} {}
template<typename UHead> template<typename UHead>
SPROUT_CONSTEXPR head_base(UHead&& v) explicit SPROUT_CONSTEXPR head_base(UHead&& v)
: head_(sprout::forward<UHead>(v)) : head_(sprout::forward<UHead>(v))
{} {}
}; };
@ -176,11 +176,15 @@ namespace sprout {
, base_type(sprout::forward<UHead>(h)) , base_type(sprout::forward<UHead>(h))
{} {}
SPROUT_CONSTEXPR tuple_impl(tuple_impl const&) = default; SPROUT_CONSTEXPR tuple_impl(tuple_impl const&) = default;
#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ <= 1))
SPROUT_CONSTEXPR tuple_impl(tuple_impl&&) = default;
#else
SPROUT_CONSTEXPR tuple_impl(tuple_impl&& t) SPROUT_CONSTEXPR tuple_impl(tuple_impl&& t)
SPROUT_NOEXCEPT_EXPR(std::is_nothrow_move_constructible<Head>::value && std::is_nothrow_move_constructible<inherited_type>::value) SPROUT_NOEXCEPT_EXPR(std::is_nothrow_move_constructible<Head>::value && std::is_nothrow_move_constructible<inherited_type>::value)
: inherited_type(sprout::move(tail(t))) : inherited_type(sprout::move(tail(t)))
, base_type(sprout::forward<Head>(head(t))) , base_type(sprout::forward<Head>(head(t)))
{} {}
#endif
template<typename... UTypes> template<typename... UTypes>
SPROUT_CONSTEXPR tuple_impl(tuple_impl<Index, UTypes...> const& t) SPROUT_CONSTEXPR tuple_impl(tuple_impl<Index, UTypes...> const& t)
: inherited_type(sprout::tuples::detail::tuple_impl<Index, UTypes...>::tail(t)) : inherited_type(sprout::tuples::detail::tuple_impl<Index, UTypes...>::tail(t))