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

3cc35adb · Antal Tátrai · e70f9256 · 3cc35adb
Commit 3cc35adb authored Mar 05, 2016 by Antal Tátrai
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

map.h src/google/protobuf/map.h +1 -1

No files found.
--- 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>