Port to C++11

This commit is contained in:
Peter Dimov
2018-10-18 07:19:45 +03:00
parent 38b20dd503
commit 90cc6b7374
12 changed files with 508 additions and 398 deletions
+16 -16
View File
@@ -24,111 +24,111 @@ struct X
int main()
{
{
variant<int> v( in_place_index<0> );
variant<int> v( in_place_index_t<0>{} );
BOOST_TEST_EQ( v.index(), 0 );
BOOST_TEST_EQ( get<0>(v), 0 );
}
{
variant<X> v( in_place_index<0> );
variant<X> v( in_place_index_t<0>{} );
BOOST_TEST_EQ( v.index(), 0 );
}
{
variant<int> v( in_place_index<0>, 1 );
variant<int> v( in_place_index_t<0>{}, 1 );
BOOST_TEST_EQ( v.index(), 0 );
BOOST_TEST_EQ( get<0>(v), 1 );
}
{
variant<int, float> v( in_place_index<0> );
variant<int, float> v( in_place_index_t<0>{} );
BOOST_TEST_EQ( v.index(), 0 );
BOOST_TEST_EQ( get<0>(v), 0 );
}
{
variant<int, float> v( in_place_index<0>, 1 );
variant<int, float> v( in_place_index_t<0>{}, 1 );
BOOST_TEST_EQ( v.index(), 0 );
BOOST_TEST_EQ( get<0>(v), 1 );
}
{
variant<int, float> v( in_place_index<1> );
variant<int, float> v( in_place_index_t<1>{} );
BOOST_TEST_EQ( v.index(), 1 );
BOOST_TEST_EQ( get<1>(v), 0 );
}
{
variant<int, float> v( in_place_index<1>, 3.14f );
variant<int, float> v( in_place_index_t<1>{}, 3.14f );
BOOST_TEST_EQ( v.index(), 1 );
BOOST_TEST_EQ( get<1>(v), 3.14f );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<0>, 1 );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<0>{}, 1 );
BOOST_TEST_EQ( v.index(), 0 );
BOOST_TEST_EQ( get<0>(v), 1 );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<1>, 1 );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<1>{}, 1 );
BOOST_TEST_EQ( v.index(), 1 );
BOOST_TEST_EQ( get<1>(v), 1 );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<2>, 3.14f );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<2>{}, 3.14f );
BOOST_TEST_EQ( v.index(), 2 );
BOOST_TEST_EQ( get<2>(v), 3.14f );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<3>, 3.14f );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<3>{}, 3.14f );
BOOST_TEST_EQ( v.index(), 3 );
BOOST_TEST_EQ( get<3>(v), 3.14f );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<4>, "text" );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<4>{}, "text" );
BOOST_TEST_EQ( v.index(), 4 );
BOOST_TEST_EQ( get<4>(v), std::string("text") );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<5>, "text" );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<5>{}, "text" );
BOOST_TEST_EQ( v.index(), 5 );
BOOST_TEST_EQ( get<5>(v), std::string("text") );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<5>, 4, 'a' );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<5>{}, 4, 'a' );
BOOST_TEST_EQ( v.index(), 5 );
BOOST_TEST_EQ( get<5>(v), std::string( 4, 'a' ) );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<4>, { 'a', 'b', 'c' } );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<4>{}, { 'a', 'b', 'c' } );
BOOST_TEST_EQ( v.index(), 4 );
BOOST_TEST_EQ( get<4>(v), (std::string{ 'a', 'b', 'c' }) );
}
{
variant<int, int, float, float, std::string, std::string> v( in_place_index<5>, { 'a', 'b', 'c' }, std::allocator<char>() );
variant<int, int, float, float, std::string, std::string> v( in_place_index_t<5>{}, { 'a', 'b', 'c' }, std::allocator<char>() );
BOOST_TEST_EQ( v.index(), 5 );
BOOST_TEST_EQ( get<5>(v), (std::string{ 'a', 'b', 'c' }) );