Ticket #9238: spirit-variant-variadic.patch

boost/spirit/home/qi/detail/pass_container.hpp

@@ -198 +198 @@
     // We pass through the container attribute if at least one of the embedded 
     // types in the variant requires to pass through the attribute
 
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && defined(BOOST_VARIANT_USE_VARIADIC_TEMPLATES)
+    template <typename Container, typename ValueType, typename Sequence
+      , typename T>
+    struct pass_through_container<Container, ValueType, boost::variant<T>, Sequence>
+      : pass_through_container<Container, ValueType, T, Sequence>
+    {};
+
+    template <typename Container, typename ValueType, typename Sequence
+      , BOOST_VARIANT_ENUM_PARAMS(typename T)>
+    struct pass_through_container<Container, ValueType
+          , boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Sequence>
+      : mpl::bool_<pass_through_container<Container, ValueType, T0, Sequence>::type::value ||
+                   pass_through_container<Container, ValueType, boost::variant<TN...>, Sequence>::type::value>
+    {};
+#else
 #define BOOST_SPIRIT_PASS_THROUGH_CONTAINER(z, N, _)                          \
     pass_through_container<Container, ValueType,                              \
         BOOST_PP_CAT(T, N), Sequence>::type::value ||                         \
@@ -219 +234 @@
     {};
 
 #undef BOOST_SPIRIT_PASS_THROUGH_CONTAINER
+#endif
 }}}}
 
 ///////////////////////////////////////////////////////////////////////////////

boost/spirit/home/support/attributes.hpp

@@ -202 +202 @@
     struct is_weak_substitute<T, optional<Expected> >
       : is_weak_substitute<T, Expected> {};
 
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && defined(BOOST_VARIANT_USE_VARIADIC_TEMPLATES)
+    template <typename T, typename Expected>
+    struct is_weak_substitute<boost::variant<T>, Expected>
+      : is_weak_substitute<T, Expected>
+    {};
+
+    template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Expected>
+    struct is_weak_substitute<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>,
+                              Expected>
+      : mpl::bool_<is_weak_substitute<T0, Expected>::type::value &&
+                   is_weak_substitute<boost::variant<TN...>, Expected>::type::value>
+    {};
+#else
 #define BOOST_SPIRIT_IS_WEAK_SUBSTITUTE(z, N, _)                              \
     is_weak_substitute<BOOST_PP_CAT(T, N), Expected>::type::value &&          \
     /***/
@@ -220 +233 @@
     {};
 
 #undef BOOST_SPIRIT_IS_WEAK_SUBSTITUTE
+#endif
 
     template <typename T>
     struct is_weak_substitute<T, T

boost/spirit/home/support/container.hpp

@@ -59 +59 @@
       : is_container<T>
     {};
 
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && defined(BOOST_VARIANT_USE_VARIADIC_TEMPLATES)
+    template<typename T>
+    struct is_container< boost::variant<T> >
+      : is_container<T>
+    {};
+
+    template<BOOST_VARIANT_ENUM_PARAMS(typename T)>
+    struct is_container< boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+      : mpl::bool_<is_container<T0>::value ||
+                   is_container< boost::variant<TN...> >::value> {};
+
+#else
 #define BOOST_SPIRIT_IS_CONTAINER(z, N, data)                                 \
         is_container<BOOST_PP_CAT(T, N)>::value ||                            \
     /***/
@@ -76 +88 @@
     {};
 
 #undef BOOST_SPIRIT_IS_CONTAINER
+#endif
 
     template <typename T, typename Enable/* = void*/>
     struct is_iterator_range

boost/spirit/home/support/detail/as_variant.hpp

@@ -30 +30 @@
     template <int size>
     struct as_variant_impl;
 
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && defined(BOOST_VARIANT_USE_VARIADIC_TEMPLATES)
+#else
     template <>
     struct as_variant_impl<0>
     {
@@ -39 +41 @@
             typedef variant<> type;
         };
     };
+#endif
 
 #define BOOST_FUSION_NEXT_ITERATOR(z, n, data)                                  \
     typedef typename fusion::result_of::next<BOOST_PP_CAT(I, n)>::type          \