Merge from trunk, finally.

[SVN r41817]

example/interpreter.hpp

@@ -133,8 +133,9 @@ namespace example
     void apply(Function func, token_parser & parser, Args const & args)
     {
       typedef typename mpl::deref<From>::type arg_type;
+      typedef typename mpl::next<From>::type next_iter_type;
 
-      invoker<Function, typename mpl::next<From>::type, To>::apply
+      invoker<Function, next_iter_type, To>::apply
           ( func, parser, fusion::push_back(args, parser.get<arg_type>()) );
     }
   };

test/custom_ccs/member_ccs.cpp

@@ -14,7 +14,7 @@
 #include <boost/function_types/is_callable_builtin.hpp>
 
 #ifndef BOOST_FT_CC_STDCALL
-#   error "test not supported with this compiler"
+#   error "test not supported with this compiler/platform"
 #endif
 
 namespace ft = boost::function_types;

test/custom_ccs/member_ccs_exact.cpp

@@ -14,7 +14,7 @@
 #include <boost/function_types/is_callable_builtin.hpp>
 
 #ifndef BOOST_FT_CC_STDCALL
-#   error "test not supported with this compiler"
+#   error "test not supported with this compiler/platform"
 #endif
 
 namespace ft = boost::function_types;

test/custom_ccs/nonmember_ccs.cpp

@@ -16,7 +16,7 @@
 #include <boost/function_types/is_callable_builtin.hpp>
 
 #ifndef BOOST_FT_CC_STDCALL
-#   error "test not supported with this compiler"
+#   error "test not supported with this compiler/platform"
 #endif
 
 namespace ft = boost::function_types;

test/custom_ccs/nonmember_ccs_exact.cpp

@@ -16,7 +16,7 @@
 #include <boost/function_types/is_callable_builtin.hpp>
 
 #ifndef BOOST_FT_CC_STDCALL
-#   error "test not supported with this compiler"
+#   error "test not supported with this compiler/platform"
 #endif
 
 namespace ft = boost::function_types;