Only call clear on prevector if it isn't trivially destructible and don't loop in clear
This commit is contained in:
parent
aaa02e7f24
commit
45a5aaf147
1 changed files with 12 additions and 5 deletions
|
@ -10,6 +10,7 @@
|
|||
#include <string.h>
|
||||
|
||||
#include <iterator>
|
||||
#include <type_traits>
|
||||
|
||||
#pragma pack(push, 1)
|
||||
/** Implements a drop-in replacement for std::vector<T> which stores up to N
|
||||
|
@ -382,10 +383,14 @@ public:
|
|||
iterator erase(iterator first, iterator last) {
|
||||
iterator p = first;
|
||||
char* endp = (char*)&(*end());
|
||||
while (p != last) {
|
||||
(*p).~T();
|
||||
_size--;
|
||||
++p;
|
||||
if (!std::is_trivially_destructible<T>::value) {
|
||||
while (p != last) {
|
||||
(*p).~T();
|
||||
_size--;
|
||||
++p;
|
||||
}
|
||||
} else {
|
||||
_size -= last - p;
|
||||
}
|
||||
memmove(&(*first), &(*last), endp - ((char*)(&(*last))));
|
||||
return first;
|
||||
|
@ -426,7 +431,9 @@ public:
|
|||
}
|
||||
|
||||
~prevector() {
|
||||
clear();
|
||||
if (!std::is_trivially_destructible<T>::value) {
|
||||
clear();
|
||||
}
|
||||
if (!is_direct()) {
|
||||
free(_union.indirect);
|
||||
_union.indirect = NULL;
|
||||
|
|
Loading…
Reference in a new issue