diff --git a/include/boost/geometry/iterators/concatenate_iterator.hpp b/include/boost/geometry/iterators/concatenate_iterator.hpp index 7321f1c81..32a8b2332 100644 --- a/include/boost/geometry/iterators/concatenate_iterator.hpp +++ b/include/boost/geometry/iterators/concatenate_iterator.hpp @@ -10,6 +10,8 @@ #ifndef BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP #define BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP +#include +#include #include #include #include @@ -35,17 +37,6 @@ private: struct enabler {}; - template - struct is_convertible - : boost::mpl::if_c - < - boost::is_convertible::value - && boost::is_convertible::value, - boost::true_type, - boost::false_type - >::type - {}; - public: typedef Iterator1 first_iterator_type; typedef Iterator2 second_iterator_type; @@ -67,9 +58,10 @@ public: template concatenate_iterator (concatenate_iterator const& other, - typename boost::enable_if + typename boost::enable_if_c < - is_convertible, + boost::is_convertible::value + && boost::is_convertible::value, enabler >::type = enabler()) : m_it1(other.m_it1), m_end1(other.m_end1), m_it2(other.m_it2) diff --git a/include/boost/geometry/iterators/flatten_iterator.hpp b/include/boost/geometry/iterators/flatten_iterator.hpp index 4a7c68a6d..9e3983cc4 100644 --- a/include/boost/geometry/iterators/flatten_iterator.hpp +++ b/include/boost/geometry/iterators/flatten_iterator.hpp @@ -85,10 +85,8 @@ public: > const& other, typename boost::enable_if < - boost::is_convertible - < - OtherValue*, Value* - >, enabler + boost::is_convertible, + enabler >::type = enabler()) : m_outer_it(other.m_outer_it), m_outer_end(other.m_outer_end), diff --git a/include/boost/geometry/iterators/point_iterator.hpp b/include/boost/geometry/iterators/point_iterator.hpp index 50613fafc..07a70c4e0 100644 --- a/include/boost/geometry/iterators/point_iterator.hpp +++ b/include/boost/geometry/iterators/point_iterator.hpp @@ -10,6 +10,7 @@ #ifndef BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP #define BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP +#include #include #include