Skip to content

Commit

Permalink
Merge pull request #7 from icedtoast/master
Browse files Browse the repository at this point in the history
Fix expected<void, E> specialization on VC2017 (thanks to Isaac Devine @icedtoast)
  • Loading branch information
martinmoene committed Jun 6, 2017
2 parents 04340de + 7a0c8db commit 2ca4986
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/nonstd/expected.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -776,8 +776,8 @@ class expected<void, E>
{
}

nsel_REQUIRES_0(
std::is_copy_constructible<E>::value )
// nsel_REQUIRES_0(
// std::is_copy_constructible<E>::value )

nsel_constexpr14 expected( expected const & rhs )
: has_value( rhs.has_value )
Expand All @@ -797,8 +797,8 @@ class expected<void, E>
if ( ! has_value ) contained.construct_error( std::move( rhs.contained.error() ) );
}

nsel_REQUIRES_0(
std::is_default_constructible<E>::value )
//nsel_REQUIRES_0(
// std::is_default_constructible<E>::value )

constexpr explicit expected( in_place_t )
: has_value( true )
Expand Down

0 comments on commit 2ca4986

Please sign in to comment.