commit c71f1847c889073f5036f4be8b76973e19e16631
author Jisi Liu <liujisi@google.com> Fri Mar 11 16:58:15 2016 -0800
committer Jisi Liu <liujisi@google.com> Fri Mar 11 16:58:15 2016 -0800
tree 38fe134d2b2e9ee5db653b5fcb1bbfa1ad544032
parent dfaf1aac309c1b65679bb28fb593303ae3e8d170
parent ea1886661e1ad607e7cac03f0e720c9ab337686e

Merge pull request #1278 from smparkes/master

pass correct args to protoc for wellknown protos when used as an external repository

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)