mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-06 14:24:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for Issue #82 (conflict windows.h macro)

Browse source
This commit is contained in:
bolero-MURAKAMI 2016-03-08 12:26:33 +09:00
parent 1fabe7da1c
commit f0ba8fad5d
6 changed files with 167 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

78
sprout/iterator/merge_iterator.hpp
View file

@ -51,41 +51,41 @@ namespace sprout {
typedef typename sprout::common_iterator_reference<LIterator, RIterator>::type reference;
private:
static SPROUT_CONSTEXPR bool check_in_left(
iterator_type it1, iterator_type lst1,
iterator2_type it2, iterator2_type lst2,
iterator_type it1, iterator_type lst_1,
iterator2_type it2, iterator2_type lst_2,
Compare comp
)
{
return it1 != lst1 ? (it2 != lst2 ? !comp(*it2, *it1) : true)
: !(it2 != lst2)
return it1 != lst_1 ? (it2 != lst_2 ? !comp(*it2, *it1) : true)
: !(it2 != lst_2)
;
}
protected:
iterator_type current1;
iterator_type lst1;
iterator_type lst_1;
iterator2_type current2;
iterator2_type lst2;
iterator2_type lst_2;
Compare comp;
bool in_left;
public:
SPROUT_CONSTEXPR merge_iterator()
: current1(), lst1(), current2(), lst2(), comp(), in_left(true)
: current1(), lst_1(), current2(), lst_2(), comp(), in_left(true)
{}
merge_iterator(merge_iterator const&) = default;
SPROUT_CONSTEXPR merge_iterator(
iterator_type it1, iterator_type lst1,
iterator2_type it2, iterator2_type lst2,
iterator_type it1, iterator_type lst_1,
iterator2_type it2, iterator2_type lst_2,
Compare comp = Compare()
)
: current1(it1), lst1(lst1)
, current2(it2), lst2(lst2)
: current1(it1), lst_1(lst_1)
, current2(it2), lst_2(lst_2)
, comp(comp)
, in_left(check_in_left(it1, lst1, it2, lst2, comp))
, in_left(check_in_left(it1, lst_1, it2, lst_2, comp))
{}
template<typename U, typename V, typename W>
SPROUT_CONSTEXPR merge_iterator(merge_iterator<U, V, W> const& it)
: current1(it.base()), lst1(it.last1())
, current2(it.base2()), lst2(it.last2())
: current1(it.base()), lst_1(it.last1())
, current2(it.base2()), lst_2(it.last2())
, comp(it.compare())
, in_left(it.is_in_left())
{}
@ -99,13 +99,13 @@ namespace sprout {
return current1;
}
SPROUT_CONSTEXPR iterator_type last1() const {
return lst1;
return lst_1;
}
SPROUT_CONSTEXPR iterator2_type base2() const {
return current2;
}
SPROUT_CONSTEXPR iterator2_type last2() const {
return lst2;
return lst_2;
}
SPROUT_CONSTEXPR Compare compare() const {
return comp;
@ -120,8 +120,8 @@ namespace sprout {
return &*(*this);
}
SPROUT_CXX14_CONSTEXPR merge_iterator& operator++() {
if (current1 != lst1) {
if (current2 != lst2) {
if (current1 != lst_1) {
if (current2 != lst_2) {
if (comp(*current2, *current1)) {
++current2;
} else {
@ -130,16 +130,16 @@ namespace sprout {
} else {
++current1;
}
} else if (current2 != lst2) {
} else if (current2 != lst_2) {
++current2;
}
in_left = check_in_left(current1, lst1, current2, lst2, comp);
in_left = check_in_left(current1, lst_1, current2, lst_2, comp);
return *this;
}
SPROUT_CXX14_CONSTEXPR merge_iterator operator++(int) {
merge_iterator result(*this);
if (current1 != lst1) {
if (current2 != lst2) {
if (current1 != lst_1) {
if (current2 != lst_2) {
if (comp(*current2, *current1)) {
++current2;
} else {
@ -148,38 +148,38 @@ namespace sprout {
} else {
++current1;
}
} else if (current2 != lst2) {
} else if (current2 != lst_2) {
++current2;
}
in_left = check_in_left(current1, lst1, current2, lst2, comp);
in_left = check_in_left(current1, lst_1, current2, lst_2, comp);
return result;
}
SPROUT_CONSTEXPR merge_iterator next() const {
return current1 != lst1
? current2 != lst2
return current1 != lst_1
? current2 != lst_2
? comp(*current2, *current1)
? merge_iterator(current1, lst1, sprout::next(current2), lst2, comp)
: merge_iterator(sprout::next(current1), lst1, current2, lst2, comp)
: merge_iterator(sprout::next(current1), lst1, current2, lst2, comp)
: current2 != lst2
? merge_iterator(current1, lst1, sprout::next(current2), lst2, comp)
? merge_iterator(current1, lst_1, sprout::next(current2), lst_2, comp)
: merge_iterator(sprout::next(current1), lst_1, current2, lst_2, comp)
: merge_iterator(sprout::next(current1), lst_1, current2, lst_2, comp)
: current2 != lst_2
? merge_iterator(current1, lst_1, sprout::next(current2), lst_2, comp)
: *this
;
}
SPROUT_CXX14_CONSTEXPR void swap(merge_iterator& other)
SPROUT_NOEXCEPT_IF(
SPROUT_NOEXCEPT_EXPR(sprout::swap(current1, other.current1))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(lst1, other.lst1))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(lst_1, other.lst_1))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(current2, other.current2))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(lst2, other.lst2))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(lst_2, other.lst_2))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(comp, other.comp))
&& SPROUT_NOEXCEPT_EXPR(sprout::swap(in_left, other.in_left))
)
{
sprout::swap(current1, other.current1);
sprout::swap(lst1, other.lst1);
sprout::swap(lst_1, other.lst_1);
sprout::swap(current2, other.current2);
sprout::swap(lst2, other.lst2);
sprout::swap(lst_2, other.lst_2);
sprout::swap(comp, other.comp);
sprout::swap(in_left, other.in_left);
}
@ -213,13 +213,13 @@ namespace sprout {
//
template<typename LIterator, typename RIterator, typename Compare>
inline SPROUT_CONSTEXPR sprout::merge_iterator<LIterator, RIterator, Compare>
make_merge_iterator(LIterator it1, LIterator lst1, RIterator it2, RIterator lst2, Compare comp) {
return sprout::merge_iterator<LIterator, RIterator, Compare>(it1, lst1, it2, lst2, comp);
make_merge_iterator(LIterator it1, LIterator lst_1, RIterator it2, RIterator lst_2, Compare comp) {
return sprout::merge_iterator<LIterator, RIterator, Compare>(it1, lst_1, it2, lst_2, comp);
}
template<typename LIterator, typename RIterator>
inline SPROUT_CONSTEXPR sprout::merge_iterator<LIterator, RIterator>
make_merge_iterator(LIterator it1, LIterator lst1, RIterator it2, RIterator lst2) {
return sprout::merge_iterator<LIterator, RIterator>(it1, lst1, it2, lst2);
make_merge_iterator(LIterator it1, LIterator lst_1, RIterator it2, RIterator lst_2) {
return sprout::merge_iterator<LIterator, RIterator>(it1, lst_1, it2, lst_2);
}
//