boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-12 05:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[range] Fix the return type of range::erase() and add tests.

Browse Source
This commit is contained in:
Adam Wulkiewicz 2014-06-21 18:18:25 +02:00
parent 4ae8804b1d
commit a0a296877f
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/geometry/util/range.hpp
View File

@ -190,7 +190,7 @@ erase(Range & rng,
\ingroup utility \ingroup utility
*/ */
template <typename Range> template <typename Range>
inline typename boost::range_iterator<Range const>::type inline typename boost::range_iterator<Range>::type
erase(Range & rng, erase(Range & rng,
typename boost::range_iterator<Range const>::type cit) typename boost::range_iterator<Range const>::type cit)
{ {
@ -200,10 +200,7 @@ erase(Range & rng,
it = boost::begin(rng) it = boost::begin(rng)
+ std::distance(boost::const_begin(rng), cit); + std::distance(boost::const_begin(rng), cit);
erase(rng, it); return erase(rng, it);
// NOTE: assuming that resize() doesn't invalidate the iterators
return cit;
} }
/*! /*!
@ -242,7 +239,7 @@ erase(Range & rng,
\ingroup utility \ingroup utility
*/ */
template <typename Range> template <typename Range>
inline typename boost::range_iterator<Range const>::type inline typename boost::range_iterator<Range>::type
erase(Range & rng, erase(Range & rng,
typename boost::range_iterator<Range const>::type cfirst, typename boost::range_iterator<Range const>::type cfirst,
typename boost::range_iterator<Range const>::type clast) typename boost::range_iterator<Range const>::type clast)
@ -256,10 +253,7 @@ erase(Range & rng,
last = boost::begin(rng) last = boost::begin(rng)
+ std::distance(boost::const_begin(rng), clast); + std::distance(boost::const_begin(rng), clast);
erase(rng, first, last); return erase(rng, first, last);
// NOTE: assuming that resize() doesn't invalidate the iterators
return cfirst;
} }
}}} // namespace boost::geometry::range }}} // namespace boost::geometry::range

25
test/util/range.cpp
View File

@ -92,46 +92,55 @@ void test_all()
BOOST_CHECK(boost::size(v) == 14); // [0,13] BOOST_CHECK(boost::size(v) == 14); // [0,13]
BOOST_CHECK(bgr::back(v) == 13); BOOST_CHECK(bgr::back(v) == 13);
bgr::erase(v, end(v) - 1); std::vector<int>::iterator
it = bgr::erase(v, end(v) - 1);
BOOST_CHECK(boost::size(v) == 13); // [0,12] BOOST_CHECK(boost::size(v) == 13); // [0,12]
BOOST_CHECK(bgr::back(v) == 12); BOOST_CHECK(bgr::back(v) == 12);
BOOST_CHECK(it == end(v));
bgr::erase(v, end(v) - 3, end(v)); it = bgr::erase(v, end(v) - 3, end(v));
BOOST_CHECK(boost::size(v) == 10); // [0,9] BOOST_CHECK(boost::size(v) == 10); // [0,9]
BOOST_CHECK(bgr::back(v) == 9); BOOST_CHECK(bgr::back(v) == 9);
BOOST_CHECK(it == end(v));
bgr::erase(v, begin(v) + 2); it = bgr::erase(v, begin(v) + 2);
BOOST_CHECK(boost::size(v) == 9); // {0,1,3..9} BOOST_CHECK(boost::size(v) == 9); // {0,1,3..9}
BOOST_CHECK(bgr::at(v, 1) == 1); BOOST_CHECK(bgr::at(v, 1) == 1);
BOOST_CHECK(bgr::at(v, 2) == 3); BOOST_CHECK(bgr::at(v, 2) == 3);
BOOST_CHECK(bgr::back(v) == 9); BOOST_CHECK(bgr::back(v) == 9);
BOOST_CHECK(it == begin(v) + 2);
bgr::erase(v, begin(v) + 2, begin(v) + 2); it = bgr::erase(v, begin(v) + 2, begin(v) + 2);
BOOST_CHECK(boost::size(v) == 9); // {0,1,3..9} BOOST_CHECK(boost::size(v) == 9); // {0,1,3..9}
BOOST_CHECK(bgr::at(v, 1) == 1); BOOST_CHECK(bgr::at(v, 1) == 1);
BOOST_CHECK(bgr::at(v, 2) == 3); BOOST_CHECK(bgr::at(v, 2) == 3);
BOOST_CHECK(bgr::back(v) == 9); BOOST_CHECK(bgr::back(v) == 9);
BOOST_CHECK(it == begin(v) + 2);
bgr::erase(v, begin(v) + 2, begin(v) + 5); it = bgr::erase(v, begin(v) + 2, begin(v) + 5);
BOOST_CHECK(boost::size(v) == 6); // {0,1,6..9} BOOST_CHECK(boost::size(v) == 6); // {0,1,6..9}
BOOST_CHECK(bgr::at(v, 1) == 1); BOOST_CHECK(bgr::at(v, 1) == 1);
BOOST_CHECK(bgr::at(v, 2) == 6); BOOST_CHECK(bgr::at(v, 2) == 6);
BOOST_CHECK(bgr::back(v) == 9); BOOST_CHECK(bgr::back(v) == 9);
BOOST_CHECK(it == begin(v) + 2);
bgr::erase(v, begin(v)); it = bgr::erase(v, begin(v));
BOOST_CHECK(boost::size(v) == 5); // {1,6..9} BOOST_CHECK(boost::size(v) == 5); // {1,6..9}
BOOST_CHECK(bgr::at(v, 0) == 1); BOOST_CHECK(bgr::at(v, 0) == 1);
BOOST_CHECK(bgr::at(v, 1) == 6); BOOST_CHECK(bgr::at(v, 1) == 6);
BOOST_CHECK(bgr::back(v) == 9); BOOST_CHECK(bgr::back(v) == 9);
BOOST_CHECK(it == begin(v));
bgr::erase(v, begin(v), begin(v) + 3); it = bgr::erase(v, begin(v), begin(v) + 3);
BOOST_CHECK(boost::size(v) == 2); // {8,9} BOOST_CHECK(boost::size(v) == 2); // {8,9}
BOOST_CHECK(bgr::at(v, 0) == 8); BOOST_CHECK(bgr::at(v, 0) == 8);
BOOST_CHECK(bgr::at(v, 1) == 9); BOOST_CHECK(bgr::at(v, 1) == 9);
BOOST_CHECK(bgr::back(v) == 9); BOOST_CHECK(bgr::back(v) == 9);
BOOST_CHECK(it == begin(v));
bgr::erase(v, begin(v), end(v)); it = bgr::erase(v, begin(v), end(v));
BOOST_CHECK(boost::size(v) == 0); BOOST_CHECK(boost::size(v) == 0);
BOOST_CHECK(it == end(v));
} }
int test_main(int, char* []) int test_main(int, char* [])