1 files changed, 41 insertions, 16 deletions

diff --git a/libs/fusion/test/sequence/adapt_assoc_adt.cpp b/libs/fusion/test/sequence/adapt_assoc_adt.cpp
index c97e84b0a..a03605f1e 100644
--- a/libs/fusion/test/sequence/adapt_assoc_adt.cpp
+++ b/libs/fusion/test/sequence/adapt_assoc_adt.cpp
@@ -26,31 +26,50 @@ namespace ns
     struct y_member;
     struct z_member;
 
+    struct non_member;
+
     class point
     {
     public:
     
-        point() : x(0), y(0) {}
-        point(int in_x, int in_y) : x(in_x), y(in_y) {}
+        point() : x(0), y(0), z(0) {}
+        point(int in_x, int in_y, int in_z) : x(in_x), y(in_y), z(in_z) {}
             
         int get_x() const { return x; }
         int get_y() const { return y; }
+        int get_z() const { return z; }
         void set_x(int x_) { x = x_; }
         void set_y(int y_) { y = y_; }
+        void set_z(int z_) { z = z_; }
         
     private:
         
         int x;
         int y;
+        int z;
     };
 }
 
+#if BOOST_PP_VARIADICS
+
 BOOST_FUSION_ADAPT_ASSOC_ADT(
     ns::point,
     (int, int, obj.get_x(), obj.set_x(val), ns::x_member)
     (int, int, 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_ADT(
+    ns::point,
+    (int, int, obj.get_x(), obj.set_x(val), ns::x_member)
+    (int, int, 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()
 {
@@ -62,28 +81,30 @@ main()
 
     {
         BOOST_MPL_ASSERT_NOT((traits::is_view<ns::point>));
-        ns::point p(123, 456);
+        ns::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<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);
-        BOOST_TEST(back(p) == 9);
+        BOOST_TEST(back(p) == 12);
     }
 
     {
-        boost::fusion::vector<int, float> v1(4, 2);
-        ns::point v2(5, 3);
-        boost::fusion::vector<long, double> v3(5, 4);
+        boost::fusion::vector<int, float, int> v1(4, 2, 2);
+        ns::point v2(5, 3, 3);
+        boost::fusion::vector<long, double, int> v3(5, 4, 4);
         BOOST_TEST(v1 < v2);
         BOOST_TEST(v1 <= v2);
         BOOST_TEST(v2 > v1);
@@ -96,15 +117,15 @@ main()
 
     {
         // conversion from ns::point to vector
-        ns::point p(5, 3);
-        boost::fusion::vector<int, long> v(p);
+        ns::point p(5, 3, 3);
+        boost::fusion::vector<int, long, int> v(p);
         v = p;
     }
 
     {
         // conversion from ns::point to list
-        ns::point p(5, 3);
-        boost::fusion::list<int, long> l(p);
+        ns::point p(5, 3, 3);
+        boost::fusion::list<int, long, int> l(p);
         l = p;
     }
 
@@ -119,15 +140,19 @@ main()
         // assoc stuff
         BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::x_member>));
         BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::y_member>));
-        BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<ns::point, ns::z_member> >));
+        BOOST_MPL_ASSERT((boost::fusion::result_of::has_key<ns::point, ns::z_member>));
+        BOOST_MPL_ASSERT((boost::mpl::not_<boost::fusion::result_of::has_key<ns::point, ns::non_member> >));
+
 
         BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int>));
         BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int>));
+        BOOST_MPL_ASSERT((boost::is_same<boost::fusion::result_of::value_at_key<ns::point, ns::z_member>::type, int>));
 
-        ns::point p(5, 3);
+        ns::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();