Skip to content

P
protobuf
Commit dfaf1aac authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Merge pull request #1317 from benvanik/patch-1 

Fixing compilation error when building with emscripten.
parents 48ebb29a 58f07644
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/google/protobuf/map.h
View file @ dfaf1aac
...@@ -545,7 +545,9 @@ class Map { ...@@ -545,7 +545,9 @@ class Map {
} }
#if __cplusplus >= 201103L && !defined(GOOGLE_PROTOBUF_OS_APPLE) && \ #if __cplusplus >= 201103L && !defined(GOOGLE_PROTOBUF_OS_APPLE) && \
!defined(GOOGLE_PROTOBUF_OS_NACL) && !defined(GOOGLE_PROTOBUF_OS_ANDROID) !defined(GOOGLE_PROTOBUF_OS_NACL) && \
!defined(GOOGLE_PROTOBUF_OS_ANDROID) && \
!defined(GOOGLE_PROTOBUF_OS_EMSCRIPTEN)
template<class NodeType, class... Args> template<class NodeType, class... Args>
void construct(NodeType* p, Args&&... args) { void construct(NodeType* p, Args&&... args) {
// Clang 3.6 doesn't compile static casting to void* directly. (Issue #1266) // Clang 3.6 doesn't compile static casting to void* directly. (Issue #1266)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment