Merge.

[SVN r42905]

example/fast_mem_fn_example.cpp

@@ -101,7 +101,11 @@ int main()
 
   setup_test(v);
   t.restart();
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1400)
   do_test(v, BOOST_EXAMPLE_FAST_MEM_FN(& test::id));
+#else // MSVC<8 does not like the implementation of the deduction macro:
+  do_test(v, ::example::fast_mem_fn< int (test::*)() const, & test::id >());
+#endif
   time1 = t.elapsed();
   std::cout << "fast_mem_fn                    | " << time1 << std::endl;
 

example/interface_example.cpp

@@ -8,6 +8,7 @@
 // See interface.hpp in this directory for details.
 
 #include <iostream>
+#include <typeinfo>
 
 #include "interface.hpp"
 

example/interpreter.hpp

@@ -135,7 +135,7 @@ namespace example
       typedef typename mpl::deref<From>::type arg_type;
       typedef typename mpl::next<From>::type next_iter_type;
 
-      invoker<Function, next_iter_type, To>::apply
+      interpreter::invoker<Function, next_iter_type, To>::apply
           ( func, parser, fusion::push_back(args, parser.get<arg_type>()) );
     }
   };