Browse Source

Clarify prevector::erase and avoid swap-to-clear

0.15
Pieter Wuille 8 years ago
parent
commit
e241a63c23
  1. 6
      src/prevector.h
  2. 5
      src/script/script.h

6
src/prevector.h

@ -387,6 +387,12 @@ public: @@ -387,6 +387,12 @@ public:
}
iterator erase(iterator first, iterator last) {
// Erase is not allowed to the change the object's capacity. That means
// that when starting with an indirectly allocated prevector with
// size and capacity > N, the result may be a still indirectly allocated
// prevector with size <= N and capacity > N. A shrink_to_fit() call is
// necessary to switch to the (more efficient) directly allocated
// representation (with capacity N and size <= N).
iterator p = first;
char* endp = (char*)&(*end());
if (!std::is_trivially_destructible<T>::value) {

5
src/script/script.h

@ -642,8 +642,9 @@ public: @@ -642,8 +642,9 @@ public:
void clear()
{
// The default std::vector::clear() does not release memory.
CScriptBase().swap(*this);
// The default prevector::clear() does not release memory
CScriptBase::clear();
shrink_to_fit();
}
};

Loading…
Cancel
Save