mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-24 03:03:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10622 from alalek:fix_build_js

Browse Source 
Re-apply protobuf fix for JavaScript builds
This commit is contained in:
Alexander Alekhin 2018-01-17 23:52:26 +03:00 committed by GitHub
commit aa55cdb735
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/protobuf/src/google/protobuf/stubs/port.h vendored
View File

@ -239,8 +239,7 @@ static const uint64 kuint64max = GOOGLE_ULONGLONG(0xFFFFFFFFFFFFFFFF);
#if defined(__clang__) && defined(__has_cpp_attribute) \
&& !defined(GOOGLE_PROTOBUF_OS_APPLE)
# if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN) || \
__has_cpp_attribute(clang::fallthrough)
# if defined(GOOGLE_PROTOBUF_OS_NACL) || __has_cpp_attribute(clang::fallthrough)
# define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
# endif
#elif defined(__GNUC__) && __GNUC__ > 6