diff options
| author | Bo Yang <teboring@google.com> | 2015-07-06 16:07:57 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-07-09 12:39:52 -0700 |
| commit | 9f563bd0d8863da35524f7d0a6f87abb2ec228a3 (patch) | |
| tree | 8475f940f97422dcba951238e93b16f223d94f0b /src/google/protobuf/map.h | |
| parent | 5a020d41a55d2ad44bf0e84c74ba91758ef5d016 (diff) | |
| download | protobuf-9f563bd0d8863da35524f7d0a6f87abb2ec228a3.tar.gz protobuf-9f563bd0d8863da35524f7d0a6f87abb2ec228a3.tar.bz2 protobuf-9f563bd0d8863da35524f7d0a6f87abb2ec228a3.zip | |
Internal local modifications.
Diffstat (limited to 'src/google/protobuf/map.h')
| -rw-r--r-- | src/google/protobuf/map.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index 96d2f201..163ce9dc 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -168,7 +168,8 @@ 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) template<class NodeType, class... Args> void construct(NodeType* p, Args&&... args) { new (p) NodeType(std::forward<Args>(args)...); |