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

Re-apply protobuf fix for JavaScript builds

Browse Source 
original commit: f503515082
JavaScript bindings for dnn module
This commit is contained in:
Dmitry Kurtaev 2017-12-02 23:52:35 +03:00 committed by Alexander Alekhin
parent a55aed5f42
commit ec8d39d059
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) \ #if defined(__clang__) && defined(__has_cpp_attribute) \
&& !defined(GOOGLE_PROTOBUF_OS_APPLE) && !defined(GOOGLE_PROTOBUF_OS_APPLE)
# if defined(GOOGLE_PROTOBUF_OS_NACL) || defined(EMSCRIPTEN) || \ # if defined(GOOGLE_PROTOBUF_OS_NACL) || __has_cpp_attribute(clang::fallthrough)
__has_cpp_attribute(clang::fallthrough)
# define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]] # define GOOGLE_FALLTHROUGH_INTENDED [[clang::fallthrough]]
# endif # endif
#elif defined(__GNUC__) && __GNUC__ > 6 #elif defined(__GNUC__) && __GNUC__ > 6