Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

rework assignment/copy operator, add operator[] to DeallocatingVector RA-iterator

Browse Source
This commit is contained in:
Dennis Luxen 2014-07-18 10:59:46 +02:00
parent d5a9f8e177
commit 0592897859
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DataStructures/DeallocatingVector.h
View File

@ -50,14 +50,10 @@ template <typename ElementT> struct DeallocatingVectorIteratorState
std::size_t index;
std::vector<ElementT *> *bucket_list;
inline DeallocatingVectorIteratorState &operator=(const DeallocatingVectorIteratorState &a)
inline DeallocatingVectorIteratorState &operator=(const DeallocatingVectorIteratorState &other)
{
if (this != &a)
{
this->DeallocatingVectorIteratorState::
~DeallocatingVectorIteratorState(); // explicit non-virtual destructor call
new (this) DeallocatingVectorIteratorState(a); // placement new
}
index = other.index;
bucket_list = other.bucket_list;
return *this;
}
};
@ -102,6 +98,13 @@ class DeallocatingVectorIterator
const std::size_t current_index = current_state.index % ELEMENTS_PER_BLOCK;
return (current_state.bucket_list->at(current_bucket)[current_index]);
}
ElementT &operator[](const std::size_t index) const
{
const std::size_t current_bucket = (index + current_state.index) / ELEMENTS_PER_BLOCK;
const std::size_t current_index = (index + current_state.index) % ELEMENTS_PER_BLOCK;
return (current_state.bucket_list->at(current_bucket)[current_index]);
}
};
template <typename ElementT, std::size_t ELEMENTS_PER_BLOCK>