merged fusion from the trunk

[SVN r63560]
2010-07-03 20:10:58 +00:00
parent 649770fdcd
commit 1572e0e9c3
402 changed files with 4874 additions and 5055 deletions
--- a/include/boost/fusion/iterator/basic_iterator.hpp
+++ b/include/boost/fusion/iterator/basic_iterator.hpp
@ -122,8 +122,8 @@ namespace boost { namespace fusion
          : seq(it.seq)
        {}

-        basic_iterator(Seq& seq, int)
-          : seq(&seq)
+        basic_iterator(Seq& in_seq, int)
+          : seq(&in_seq)
        {}

        template<typename OtherSeq>