organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1299 from tatraian/master

Browse source 
Fix compiling clang/libc++ builds. (Issue: #1266)
This commit is contained in:
Feng Xiao 2016-03-08 11:15:24 -08:00
commit 48ebb29a8e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/google/protobuf/map.h
View file

@ -548,7 +548,11 @@ 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)...);
// 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>