Merge pull request #1299 from tatraian/master
Fix compiling clang/libc++ builds. (Issue: #1266)
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index dfc6242..37e19b0 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -548,7 +548,11 @@
!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)...);
+ // Clang 3.6 doesn't compile static casting to void* directly. (Issue #1266)
+ // According C++ standard 5.2.9/1: "The static_cast operator shall not cast
+ // away constness". So first the maybe const pointer is casted to const void* and
+ // after the const void* is const casted.
+ new (const_cast<void*>(static_cast<const void*>(p))) NodeType(std::forward<Args>(args)...);
}
template<class NodeType>