Skip to content
Snippets Groups Projects
Commit f5cca14c authored by Jan Trávníček's avatar Jan Trávníček
Browse files

fix default creation of variant

parent 0f60e67c
No related branches found
No related tags found
No related merge requests found
......@@ -157,6 +157,8 @@ protected:
public:
variant_base(const F& value) : variant_base<ST, AT, Ts...>::variant_base ( typeid(F).hash_code() ) { new (&this->data) F(value); }
variant_base(F&& value) : variant_base<ST, AT, Ts...>::variant_base ( typeid(F).hash_code() ) { new (&this->data) F(std::move(value)); }
variant_base() : variant_base<ST, AT, Ts ... >::variant_base ( ) { }
};
 
template<typename ST, typename AT, typename... Ts>
......@@ -304,12 +306,12 @@ public:
}
 
template < typename T >
static typename std::enable_if < std::is_base_of_any<T, Ts...>::value && ! std::is_same < void, T >::value, variant < Ts ... > >::type from ( ) {
return variant < Ts ... >( T ( ) );
static typename std::enable_if < ! std::is_same < void, T >::value, variant < Ts ... > >::type from ( ) {
return variant < Ts ... >( T { } );
}
 
template < typename T >
static typename std::enable_if < std::is_base_of_any<T, Ts...>::value && std::is_same < void, T >::value, variant < Ts ... > >::type from ( ) {
static typename std::enable_if < std::is_same < void, T >::value, variant < Ts ... > >::type from ( ) {
return variant < Ts ... >( );
}
};
......
......@@ -126,10 +126,21 @@ void VariantTest::testVariantVoid() {
v = 10;
 
CPPUNIT_ASSERT ( v.get<int>() == 10 );
std::variant<int, void> v2;
CPPUNIT_ASSERT ( v2.is < void > ( ) );
}
 
void VariantTest::testVariantDefault() {
std::variant<int, std::string> v = std::variant<int, std::string>::from<std::string>();
std::variant<int, std::string, void> v1 = std::variant<int, std::string, void>::from<std::string>();
CPPUNIT_ASSERT ( v1.get<std::string>() == "");
std::variant<int, std::string, void> v2 = std::variant<int, std::string, void>::from<void>();
CPPUNIT_ASSERT ( v2.is<void> ( ) );
std::variant<int, std::string, void> v3 = std::variant<int, std::string, void>::from<int>();
 
CPPUNIT_ASSERT ( v.get<std::string>() == "");
CPPUNIT_ASSERT ( v3.get<int> ( ) == 0 );
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment