Merge pull request #430 from xfxyjwf/std11_fix

Make MapAllocator work with C++11.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index f246dd10..543b45d7 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -167,11 +167,23 @@ class Map {
       }
     }
 
+#if __cplusplus >= 201103L
+    template<class NodeType, class... Args>
+    void construct(NodeType* p, Args&&... args) {
+      new (p) NodeType(std::forward<Args>(args)...);
+    }
+
+    template<class NodeType>
+    void destroy(NodeType* p) {
+      if (arena_ == NULL) p->~NodeType();
+    }
+#else
     void construct(pointer p, const_reference t) { new (p) value_type(t); }
 
     void destroy(pointer p) {
       if (arena_ == NULL) p->~value_type();
     }
+#endif
 
     template <typename X>
     struct rebind {