Ticket #7732: adl-issues.patch

boost/spirit/home/karma/generate.hpp

@@ -66 +66 @@
         BOOST_SPIRIT_ASSERT_MATCH(karma::domain, Expr);
 
         typename detail::make_context<Attr>::type context(attr);
-        return compile<karma::domain>(expr).generate(sink, context, unused, attr);
+        return spirit::compile<karma::domain>(expr).generate(sink, context, unused, attr);
     }
 
     template <typename OutputIterator, typename Expr, typename Attr>
@@ -148 +148 @@
         BOOST_SPIRIT_ASSERT_MATCH(karma::domain, Delimiter);
 
         typename result_of::compile<karma::domain, Delimiter>::type const 
-            delimiter_ = compile<karma::domain>(delimiter);
+            delimiter_ = spirit::compile<karma::domain>(delimiter);
 
         if (pre_delimit == delimit_flag::predelimit &&
             !karma::delimit_out(sink, delimiter_))
@@ -157 +157 @@
         }
 
         typename detail::make_context<Attribute>::type context(attr);
-        return compile<karma::domain>(expr).
+        return spirit::compile<karma::domain>(expr).
             generate(sink, context, delimiter_, attr);
     }
 

boost/spirit/home/qi/parse.hpp

@@ -83 +83 @@
         BOOST_SPIRIT_ASSERT_MATCH(qi::domain, Expr);
 
         typename detail::make_context<Attr>::type context(attr);
-        return compile<qi::domain>(expr).parse(first, last, context, unused, attr);
+        return spirit::compile<qi::domain>(expr).parse(first, last, context, unused, attr);
     }
 
     template <typename Iterator, typename Expr, typename Attr>
@@ -158 +158 @@
         typedef
             typename result_of::compile<qi::domain, Skipper>::type
         skipper_type;
-        skipper_type const skipper_ = compile<qi::domain>(skipper);
+        skipper_type const skipper_ = spirit::compile<qi::domain>(skipper);
 
         typename detail::make_context<Attr>::type context(attr);
-        if (!compile<qi::domain>(expr).parse(
+        if (!spirit::compile<qi::domain>(expr).parse(
                 first, last, context, skipper_, attr))
             return false;