Merge from trunk

[SVN r81061]
2012-10-25 02:06:21 +00:00
parent 940c594d3e
commit fc38122f0f
21 changed files with 525 additions and 171 deletions
--- a/include/boost/fusion/iterator/iterator_adapter.hpp
+++ b/include/boost/fusion/iterator/iterator_adapter.hpp
@ -23,8 +23,8 @@ namespace boost { namespace fusion
        iterator_base_type;
        iterator_base_type iterator_base;

-        iterator_adapter(iterator_base_type const& iterator_base)
-            : iterator_base(iterator_base) {}
+        iterator_adapter(iterator_base_type const& iterator_base_)
+            : iterator_base(iterator_base_) {}

        // default implementation
        template <typename I1, typename I2>