commit 3cc35adb6dca9057a790d253b9f5e2b9b000a106
author Antal Tátrai <antal.tatrai@gmail.com> Sat Mar 05 09:32:59 2016 +0100
committer Antal Tátrai <antal.tatrai@gmail.com> Sat Mar 05 09:32:59 2016 +0100
tree fd95bcb7a491680107c2ce5131d82befca5bf168
parent e70f9256af79af6092eae4ce22a61b1b6651f37d

Fix compiling clang/libc++ builds. (Issue: #1266)

src/google/protobuf/map.h

diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index dfc6242..9dd4257 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -548,7 +548,7 @@
     !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>