Merge pull request #1317 from benvanik/patch-1

Fixing compilation error when building with emscripten.

Merge pull request #1317 from benvanik/patch-1
Fixing compilation error when building with emscripten.
dfaf1aac · Feng Xiao · 48ebb29a · 58f07644 · dfaf1aac
Commit dfaf1aac authored Mar 11, 2016 by Feng Xiao
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -545,7 +545,9 @@ class Map {
    }

 #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>
    void construct(NodeType* p, Args&&... args) {
      // Clang 3.6 doesn't compile static casting to void* directly. (Issue #1266)