From 4b0add90202501706e49a36fc4ceb8ca8b6f09aa Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 16 Jun 2015 19:57:08 +0100
Subject: [PATCH] follow allocator propagation rules

---
 octa/memory.h | 8 ++++----
 octa/vector.h | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/octa/memory.h b/octa/memory.h
index 2a4a50f..db23892 100644
--- a/octa/memory.h
+++ b/octa/memory.h
@@ -800,7 +800,7 @@ namespace detail {
 } /* namespace detail */
 
 template<typename A>
-using PropagateOnContainerCopyAssignment
+using AllocatorPropagateOnContainerCopyAssignment
     = typename octa::detail::PropagateOnContainerCopyAssignmentBase<A>::Type;
 
 /* allocator propagate on container move assignment */
@@ -827,7 +827,7 @@ namespace detail {
 } /* namespace detail */
 
 template<typename A>
-using PropagateOnContainerMoveAssignment
+using AllocatorPropagateOnContainerMoveAssignment
     = typename octa::detail::PropagateOnContainerMoveAssignmentBase<A>::Type;
 
 /* allocator propagate on container swap */
@@ -853,7 +853,7 @@ namespace detail {
 } /* namespace detail */
 
 template<typename A>
-using PropagateOnContainerSwap
+using AllocatorPropagateOnContainerSwap
     = typename octa::detail::PropagateOnContainerSwapBase<A>::Type;
 
 /* allocator is always equal */
@@ -878,7 +878,7 @@ namespace detail {
 } /* namespace detail */
 
 template<typename A>
-using IsAlwaysEqual = typename octa::detail::IsAlwaysEqualBase<A>::Type;
+using AllocatorIsAlwaysEqual = typename octa::detail::IsAlwaysEqualBase<A>::Type;
 
 /* allocator allocate */
 
diff --git a/octa/vector.h b/octa/vector.h
index 5ce6e22..7169699 100644
--- a/octa/vector.h
+++ b/octa/vector.h
@@ -192,6 +192,11 @@ public:
     Vector &operator=(const Vector &v) {
         if (this == &v) return *this;
         clear();
+        if (octa::AllocatorPropagateOnContainerCopyAssignment<A>::value) {
+            octa::allocator_deallocate(p_buf.second(), p_buf.first(), p_cap);
+            p_cap = 0;
+            p_buf.second() = v.p_buf.second();
+        }
         reserve(v.p_cap);
         p_len = v.p_len;
         copy_contents(v);
@@ -201,6 +206,8 @@ public:
     Vector &operator=(Vector &&v) {
         clear();
         octa::allocator_deallocate(p_buf.second(), p_buf.first(), p_cap);
+        if (octa::AllocatorPropagateOnContainerMoveAssignment<A>::value)
+            p_buf.second() = v.p_buf.second();
         p_len = v.p_len;
         p_cap = v.p_cap;
         p_buf.~VecPair();