commit dfaf1aac309c1b65679bb28fb593303ae3e8d170
author Feng Xiao <xiaofeng@google.com> Fri Mar 11 12:10:06 2016 -0800
committer Feng Xiao <xiaofeng@google.com> Fri Mar 11 12:10:06 2016 -0800
tree 497f8730e5c3eb15bdc6bb8762daae6c6e368c33
parent 48ebb29a8ec118bf6b9ee39f6be42b57321c099a
parent 58f07644eab25f68973ecab4bdc43fc318c26131

Merge pull request #1317 from benvanik/patch-1

Fixing compilation error when building with emscripten.

src/google/protobuf/map.h

diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index 37e19b0..8319938 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -545,7 +545,9 @@
     }
 
 #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)