boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 23:42:12 +00:00
Code Issues Projects Releases Wiki Activity

[point_iterator] minor and stylistic changes; in concatenate_iterator use enable_if_c instead of enable_if (shorter code);

Browse Source
This commit is contained in:
Menelaos Karavelas
2014-03-28 00:30:50 +02:00
parent 5e96c27c84
commit e1f39cd065
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/geometry/iterators/concatenate_iterator.hpp
View File

@@ -10,6 +10,8 @@
#ifndef BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
#define BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
#include <boost/type_traits.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/iterator.hpp>
#include <boost/iterator/iterator_facade.hpp>
#include <boost/iterator/iterator_categories.hpp>
@@ -35,17 +37,6 @@ private:
struct enabler {};
template <typename T1, typename OtherT1, typename T2, typename OtherT2>
struct is_convertible
: boost::mpl::if_c
<
boost::is_convertible<T1, OtherT1>::value
&& boost::is_convertible<T2, OtherT2>::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 <typename OtherIt1, typename OtherIt2, typename OtherValue>
concatenate_iterator
(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other,
typename boost::enable_if
typename boost::enable_if_c
<
is_convertible<OtherIt1, Iterator1, OtherIt2, Iterator2>,
boost::is_convertible<OtherIt1, Iterator1>::value
&& boost::is_convertible<OtherIt2, Iterator2>::value,
enabler
>::type = enabler())
: m_it1(other.m_it1), m_end1(other.m_end1), m_it2(other.m_it2)

6
include/boost/geometry/iterators/flatten_iterator.hpp
View File

@@ -85,10 +85,8 @@ public:
> const& other,
typename boost::enable_if
<
boost::is_convertible
<
OtherValue*, Value*
>, enabler
boost::is_convertible<OtherValue*, Value*>,
enabler
>::type = enabler())
: m_outer_it(other.m_outer_it),
m_outer_end(other.m_outer_end),

1
include/boost/geometry/iterators/point_iterator.hpp
View File

@@ -10,6 +10,7 @@
#ifndef BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
#define BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
#include <boost/utility/enable_if.hpp>
#include <boost/geometry/iterators/dispatch/point_iterator.hpp>
#include <boost/geometry/iterators/point_iterator_type.hpp>