diff options
| author | Feng Xiao <xiaofeng@google.com> | 2016-03-11 12:10:06 -0800 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2016-03-11 12:10:06 -0800 |
| commit | dfaf1aac309c1b65679bb28fb593303ae3e8d170 (patch) | |
| tree | 497f8730e5c3eb15bdc6bb8762daae6c6e368c33 | |
| parent | 48ebb29a8ec118bf6b9ee39f6be42b57321c099a (diff) | |
| parent | 58f07644eab25f68973ecab4bdc43fc318c26131 (diff) | |
| download | protobuf-dfaf1aac309c1b65679bb28fb593303ae3e8d170.tar.gz protobuf-dfaf1aac309c1b65679bb28fb593303ae3e8d170.tar.bz2 protobuf-dfaf1aac309c1b65679bb28fb593303ae3e8d170.zip | |
Merge pull request #1317 from benvanik/patch-1
Fixing compilation error when building with emscripten.
| -rw-r--r-- | src/google/protobuf/map.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 37e19b0a..83199380 100644 --- 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) |