From 3cc35adb6dca9057a790d253b9f5e2b9b000a106 Mon Sep 17 00:00:00 2001
From: Antal Tátrai <antal.tatrai@gmail.com>
Date: Sat, 5 Mar 2016 09:32:59 +0100
Subject: Fix compiling clang/libc++ builds. (Issue: #1266)

---
 src/google/protobuf/map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/google/protobuf/map.h')

diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index dfc62420..9dd42572 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -548,7 +548,7 @@ class Map {
     !defined(GOOGLE_PROTOBUF_OS_NACL) && !defined(GOOGLE_PROTOBUF_OS_ANDROID)
     template<class NodeType, class... Args>
     void construct(NodeType* p, Args&&... args) {
-      new (static_cast<void*>(p)) NodeType(std::forward<Args>(args)...);
+      new (const_cast<void*>(static_cast<const void*>(p))) NodeType(std::forward<Args>(args)...);
     }
 
     template<class NodeType>
-- 
cgit v1.2.3