FEATURE: BOOST_FUSION_ADAPT_STRUCT can now also be called completely with

variadics arguments.

The following signature is possible :

 BOOST_FUSION_ADAPT_STRUCT(
        struct_name,
        member_name0,
        (BOOST_FUSION_ADAPT_AUTO, member_name1)
        (member_type2, member_name2)
	member_name3,
        ...
        )
This commit is contained in:
Damien Buhl (alias daminetreg)
2014-06-04 01:36:15 +02:00
parent 37fc1443ad
commit 02b776360a
3 changed files with 88 additions and 13 deletions

View File

@ -4,6 +4,8 @@
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#define BOOST_PP_VARIADICS 1
#include <boost/detail/lightweight_test.hpp>
#include <boost/fusion/adapted/struct/adapt_struct.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp>
@ -38,6 +40,7 @@ namespace ns
{
int x;
int y;
int z;
};
#if !BOOST_WORKAROUND(__GNUC__,<4)
@ -58,8 +61,9 @@ namespace ns
BOOST_FUSION_ADAPT_STRUCT(
ns::point,
(x)
(int, y)
(int, x)
(int, y),
z
)
#if !BOOST_WORKAROUND(__GNUC__,<4)
@ -71,7 +75,7 @@ BOOST_FUSION_ADAPT_STRUCT(
#endif
struct s { int m; };
BOOST_FUSION_ADAPT_STRUCT(s, (m))
BOOST_FUSION_ADAPT_STRUCT(s, (int, m))
int
main()
@ -90,13 +94,13 @@ main()
std::cout << at_c<0>(p) << std::endl;
std::cout << at_c<1>(p) << std::endl;
std::cout << p << std::endl;
BOOST_TEST(p == make_vector(123, 456));
BOOST_TEST(p == make_vector(123, 456, 4));
at_c<0>(p) = 6;
at_c<1>(p) = 9;
BOOST_TEST(p == make_vector(6, 9));
BOOST_TEST(p == make_vector(6, 9, 12));
BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 2);
BOOST_STATIC_ASSERT(boost::fusion::result_of::size<ns::point>::value == 3);
BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<ns::point>::value);
BOOST_TEST(front(p) == 6);
@ -104,9 +108,9 @@ main()
}
{
fusion::vector<int, float> v1(4, 2);
ns::point v2 = {5, 3};
fusion::vector<long, double> v3(5, 4);
fusion::vector<int, float, int> v1(4, 2, 3);
ns::point v2 = {5, 3, 2};
fusion::vector<long, double, int> v3(5, 4, 2);
BOOST_TEST(v1 < v2);
BOOST_TEST(v1 <= v2);
BOOST_TEST(v2 > v1);
@ -119,15 +123,15 @@ main()
{
// conversion from ns::point to vector
ns::point p = {5, 3};
fusion::vector<int, long> v(p);
ns::point p = {5, 3, 4};
fusion::vector<int, long, int> v(p);
v = p;
}
{
// conversion from ns::point to list
ns::point p = {5, 3};
fusion::list<int, long> l(p);
ns::point p = {5, 3, 4};
fusion::list<int, long, int> l(p);
l = p;
}