Merge upstream branch 'develop' into pr/zip_iterator/fusionize

This commit is contained in:
Kohei Takahashi
2014-08-25 00:36:36 +09:00
12 changed files with 337 additions and 141 deletions

View File

@ -15,7 +15,7 @@
#include <boost/iterator/iterator_adaptor.hpp> // for enable_if_convertible
#include <boost/iterator/iterator_categories.hpp>
#include <boost/iterator/detail/minimum_category.hpp>
#include <boost/iterator/minimum_category.hpp>
#include <utility> // for std::pair
#include <boost/fusion/adapted/boost_tuple.hpp> // for backward compatibility