AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #1005 from oon3m0oo/emscripten

Browse Source 
Adds support for building protobuf with emscripten
This commit is contained in:
Feng Xiao 2015-11-24 15:22:06 -08:00
commit d8b6452e37
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/google/protobuf/map.h
View File

@ -546,7 +546,9 @@ 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) !defined(GOOGLE_PROTOBUF_OS_NACL) && \
!defined(GOOGLE_PROTOBUF_OS_ANDROID) && \
!defined(GOOGLE_PROTOBUF_OS_EMSCRIPTEN)
template<class NodeType, class... Args> template<class NodeType, class... Args>
void construct(NodeType* p, Args&&... args) { void construct(NodeType* p, Args&&... args) {
new (static_cast<void*>(p)) NodeType(std::forward<Args>(args)...); new (static_cast<void*>(p)) NodeType(std::forward<Args>(args)...);

2
src/google/protobuf/stubs/platform_macros.h
View File

@ -97,6 +97,8 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE
#define GOOGLE_PROTOBUF_OS_IPHONE #define GOOGLE_PROTOBUF_OS_IPHONE
#endif #endif
#elif defined(__EMSCRIPTEN__)
#define GOOGLE_PROTOBUF_OS_EMSCRIPTEN
#elif defined(__native_client__) #elif defined(__native_client__)
#define GOOGLE_PROTOBUF_OS_NACL #define GOOGLE_PROTOBUF_OS_NACL
#elif defined(sun) #elif defined(sun)