From 6d6047f7425657ce0d7155574dcf95cfa3174937 Mon Sep 17 00:00:00 2001
From: mutouyun <orz@orzz.org>
Date: Sun, 17 Nov 2019 17:31:40 +0800
Subject: [PATCH] fix compilation errors for vs2015

---
 src/memory/allocator_wrapper.h | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/memory/allocator_wrapper.h b/src/memory/allocator_wrapper.h
index 8b066ba..f499fd0 100755
--- a/src/memory/allocator_wrapper.h
+++ b/src/memory/allocator_wrapper.h
@@ -51,20 +51,16 @@ private:
 public:
     allocator_wrapper() noexcept {}
 
-    // no copy
-    allocator_wrapper(const allocator_wrapper<T, AllocP>&) noexcept {}
-    template <typename U>
-    allocator_wrapper(const allocator_wrapper<U, AllocP>&) noexcept {}
+    // construct by copying (do nothing)
+    allocator_wrapper           (const allocator_wrapper<T, AllocP>&) noexcept {}
+    allocator_wrapper& operator=(const allocator_wrapper<T, AllocP>&) noexcept { return *this; }
+	
+    // construct from a related allocator (do nothing)
+    template <typename U, typename AllocU> allocator_wrapper           (const allocator_wrapper<U, AllocU>&) noexcept {}
+    template <typename U, typename AllocU> allocator_wrapper& operator=(const allocator_wrapper<U, AllocU>&) noexcept { return *this; }
 
-    allocator_wrapper(allocator_wrapper<T, AllocP> && rhs) noexcept : alloc_(std::move(rhs.alloc_)) {}
-    template <typename U>
-    allocator_wrapper(allocator_wrapper<U, AllocP> && rhs) noexcept : alloc_(std::move(rhs.alloc_)) {}
-    allocator_wrapper(alloc_policy                 && rhs) noexcept : alloc_(std::move(rhs)) {}
-
-    allocator_wrapper& operator=(allocator_wrapper && rhs) noexcept {
-        alloc_ = std::move(rhs.alloc_);
-        return *this;
-    }
+    allocator_wrapper           (allocator_wrapper && rhs) noexcept : alloc_ { std::move(rhs.alloc_) } {}
+    allocator_wrapper& operator=(allocator_wrapper && rhs) noexcept { alloc_ = std::move(rhs.alloc_); return *this; }
 
 public:
     // the other type of std_allocator