JDBtracker
/
libostd
forked from OctaForge/libostd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

follow allocator propagation on swap + do not free memory unless necessary

master
Daniel Kolesa 2015-06-16 20:02:52 +01:00
parent 4b0add9020
commit 1c6f3a74e1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
octa/vector.h
View File

@ -128,7 +128,7 @@ public:
} }
Vector(Vector &&v, const A &a): p_buf(nullptr, a) { Vector(Vector &&v, const A &a): p_buf(nullptr, a) {
if (!(a == v.p_buf.second())) { if (a != v.p_buf.second()) {
reserve(v.p_cap); reserve(v.p_cap);
p_len = v.p_len; p_len = v.p_len;
if (octa::IsPod<T>()) { if (octa::IsPod<T>()) {
@ -193,8 +193,10 @@ public:
if (this == &v) return *this; if (this == &v) return *this;
clear(); clear();
if (octa::AllocatorPropagateOnContainerCopyAssignment<A>::value) { if (octa::AllocatorPropagateOnContainerCopyAssignment<A>::value) {
octa::allocator_deallocate(p_buf.second(), p_buf.first(), p_cap); if (p_buf.second() != v.p_buf.second()) {
p_cap = 0; octa::allocator_deallocate(p_buf.second(), p_buf.first(), p_cap);
p_cap = 0;
}
p_buf.second() = v.p_buf.second(); p_buf.second() = v.p_buf.second();
} }
reserve(v.p_cap); reserve(v.p_cap);
@ -400,7 +402,9 @@ public:
void swap(Vector &v) { void swap(Vector &v) {
octa::swap(p_len, v.p_len); octa::swap(p_len, v.p_len);
octa::swap(p_cap, v.p_cap); octa::swap(p_cap, v.p_cap);
p_buf.swap(v.p_buf); octa::swap(p_buf.first(), v.p_buf.first());
if (octa::AllocatorPropagateOnContainerSwap<A>::value)
octa::swap(p_buf.second(), v.p_buf.second());
} }
A get_allocator() const { A get_allocator() const {