1 files changed, 43 insertions, 20 deletions

diff --git a/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp b/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp
index 15e2124cb..8aa600ff6 100644
--- a/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp
+++ b/libs/fusion/test/sequence/adapt_assoc_tpl_adt.cpp
@@ -26,39 +26,57 @@ namespace ns
     struct y_member;
     struct z_member;
 
-    template<typename X, typename Y>
+    struct non_member;
+
+    template<typename X, typename Y, typename Z>
     class point
     {
     public:
     
-        point() : x(0), y(0) {}
-        point(X in_x, Y in_y) : x(in_x), y(in_y) {}
+        point() : x(0), y(0), z(0) {}
+        point(X in_x, Y in_y, Z in_z) : x(in_x), y(in_y), z(in_z) {}
             
         X get_x() const { return x; }
         Y get_y() const { return y; }
+        Z get_z() const { return z; }
         void set_x(X x_) { x = x_; }
         void set_y(Y y_) { y = y_; }
+        void set_z(Z z_) { z = z_; }
         
     private:
         
         X x;
         Y y;
+        Z z;
     };
 }
 
+#if BOOST_PP_VARIADICS
+BOOST_FUSION_ADAPT_ASSOC_TPL_ADT(
+    (X)(Y)(Z),
+    (ns::point)(X)(Y)(Z),
+    (X, X, obj.get_x(), obj.set_x(val), ns::x_member)
+    (Y, Y, obj.get_y(), obj.set_y(val), ns::y_member)
+    (obj.get_z(), obj.set_z(val), ns::z_member)
+)
+  
+#else // BOOST_PP_VARIADICS
 BOOST_FUSION_ADAPT_ASSOC_TPL_ADT(
-    (X)(Y),
-    (ns::point)(X)(Y),
+    (X)(Y)(Z),
+    (ns::point)(X)(Y)(Z),
     (X, X, obj.get_x(), obj.set_x(val), ns::x_member)
     (Y, Y, obj.get_y(), obj.set_y(val), ns::y_member)
+    (BOOST_FUSION_ADAPT_AUTO, BOOST_FUSION_ADAPT_AUTO, obj.get_z(), obj.set_z(val), ns::z_member)
 )
 
+#endif
+
 int
 main()
 {
     using namespace boost::fusion;
 
-    typedef ns::point<int,int> point;
+    typedef ns::point<int,int,long> point;
 
     std::cout << tuple_open('[');
     std::cout << tuple_close(']');
@@ -66,28 +84,30 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<point>));
-        point p(123, 456);
+        point p(123, 456, 789);
 
         std::cout << at_c<0>(p) << std::endl;
         std::cout << at_c<1>(p) << std::endl;
+        std::cout << at_c<2>(p) << std::endl;
         std::cout << p << std::endl;
-        BOOST_TEST(p == make_vector(123, 456));
+        BOOST_TEST(p == make_vector(123, 456, 789));
 
         at_c<0>(p) = 6;
         at_c<1>(p) = 9;
-        BOOST_TEST(p == make_vector(6, 9));
+        at_c<2>(p) = 12;
+        BOOST_TEST(p == make_vector(6, 9, 12));
 
-        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 2);
+        BOOST_STATIC_ASSERT(boost::fusion::result_of::size<point>::value == 3);
         BOOST_STATIC_ASSERT(!boost::fusion::result_of::empty<point>::value);
 
         BOOST_TEST(front(p) == 6);
-        BOOST_TEST(back(p) == 9);
+        BOOST_TEST(back(p) == 12);
     }
 
     {
-        boost::fusion::vector<int, float> v1(4, 2);
-        point v2(5, 3);
-        boost::fusion::vector<long, double> v3(5, 4);
+        boost::fusion::vector<int, float, long> v1(4, 2, 2);
+        point v2(5, 3, 3);
+        boost::fusion::vector<long, double, long> v3(5, 4, 4);
         BOOST_TEST(v1 < v2);
         BOOST_TEST(v1 <= v2);
         BOOST_TEST(v2 > v1);
@@ -100,15 +120,15 @@ main()
 
     {
         // conversion from point to vector
-        point p(5, 3);
-        boost::fusion::vector<int, long> v(p);
+        point p(5, 3, 3);
+        boost::fusion::vector<int, long, int> v(p);
         v = p;
     }
 
     {
         // conversion from point to list
-        point p(5, 3);
-        boost::fusion::list<int, long> l(p);
+        point p(5, 3, 3);
+        boost::fusion::list<int, long, int> l(p);
         l = p;
     }
 
@@ -123,15 +143,18 @@ main()
         // assoc stuff
         BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::x_member>));
         BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::y_member>));
-        BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<point, ns::z_member> >));
+        BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<point, ns::z_member>));
+        BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<point, ns::non_member> >));
 
         BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::x_member>::type, int>));
         BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::y_member>::type, int>));
+        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<point, ns::z_member>::type, long>));
 
-        point p(5, 3);
+        point p(5, 3, 1);
 
         BOOST_TEST(at_key<ns::x_member>(p) == 5);
         BOOST_TEST(at_key<ns::y_member>(p) == 3);
+        BOOST_TEST(at_key<ns::z_member>(p) == 1);
     }
 
     return boost::report_errors();