QuasarApp/LIEF
4
0
Fork 0
mirror of https://github.com/QuasarApp/LIEF.git synced 2025-04-30 06:14:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug in windows

Browse Source
This commit is contained in:
Romain Thomas 2018-02-15 11:09:38 +01:00
parent dee5c07784
commit 2042b750e0
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/LIEF/iterators.hpp
View File

@ -132,9 +132,19 @@ class ref_iterator : public std::iterator<
if (n >= this->size()) { if (n >= this->size()) {
throw integrity_error(std::to_string(n) + " is out of bound"); throw integrity_error(std::to_string(n) + " is out of bound");
} }
auto it = this->begin();
std::advance(it, n); ref_iterator* no_const_this = const_cast<ref_iterator*>(this);
return const_cast<add_const_t<ref_t>>(*it);
typename ref_iterator::difference_type saved_dist = std::distance(std::begin(no_const_this->container_), no_const_this->it_);
no_const_this->it_ = std::begin(no_const_this->container_);
std::advance(no_const_this->it_, n);
auto&& v = const_cast<add_const_t<ref_t>>(no_const_this->operator*());
no_const_this->it_ = std::begin(no_const_this->container_);
std::advance(no_const_this->it_, saved_dist);
return v;
} }
ref_iterator operator+(typename ref_iterator::difference_type n) const { ref_iterator operator+(typename ref_iterator::difference_type n) const {

4
tests/test_iterators.cpp
View File

@ -497,7 +497,11 @@ TEST_CASE("Test const filter ref iterators", "[lief][iterators][filter][const_re
it_filter_const_ref bar_filtred = foo.get_bar_filter(); it_filter_const_ref bar_filtred = foo.get_bar_filter();
it_filter_const_ref_ptr bar_ptr_filtred = foo.get_bar_ptr_filter(); it_filter_const_ref_ptr bar_ptr_filtred = foo.get_bar_ptr_filter();
CHECK(bar_filtred[1] == "6");
CHECK(bar_filtred[0] == "1"); CHECK(bar_filtred[0] == "1");
CHECK(bar_ptr_filtred[1] == "6");
CHECK(bar_ptr_filtred[0] == "6");
} }