Ticket #3553: proto.diff

boost/proto/transform/fold.hpp

@@ -43 +43 @@
                 template<typename Sig>
                 struct result;
 
-                template<typename This, typename Expr, typename State>
+                template<typename This, typename State, typename Expr>
+#if BOOST_VERSION < 103500
                 struct result<This(Expr, State)>
+#else
+                struct result<This(State, Expr)>
+#endif
                 {
                     typedef
                         typename when<_, Transform>::template impl<Expr, State, Data>::result_type
@@ -58 +62 @@
                 {};
                 #endif
 
-                template<typename Expr, typename State>
+                template<typename State, typename Expr>
                 typename when<_, Transform>::template impl<Expr &, State const &, Data>::result_type
+#if BOOST_VERSION < 103500
                 operator ()(Expr &e, State const &s) const
+#else
+                operator ()(State const &s, Expr &e) const
+#endif
                 {
                     return typename when<_, Transform>::template impl<Expr &, State const &, Data>()(e, s, this->v_);
                 }

libs/proto/test/toy_spirit2.cpp

@@ -302 +302 @@
         #endif
 
         template<typename T>
+#if BOOST_VERSION < 103500
         bool operator ()(T const &t, bool success) const
+#else
+        bool operator ()(bool success, T const &t) const
+#endif
         {
             return success && this->parse(t);
         }