From ec8d39d059e6bafa827fa15e6369c44048596e0f Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev <dmitry.kurtaev+github@gmail.com> Date: Sat, 2 Dec 2017 23:52:35 +0300 Subject: [PATCH] Re-apply protobuf fix for JavaScript builds original commit: f5035150824c49d3a2d7cb7ce69ac1ffbdf8c63d JavaScript bindings for dnn module --- 3rdparty/protobuf/src/google/protobuf/stubs/port.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/3rdparty/protobuf/src/google/protobuf/stubs/port.h b/3rdparty/protobuf/src/google/protobuf/stubs/port.h index cecefdcb3b..658c9693a1 100644 --- a/3rdparty/protobuf/src/google/protobuf/stubs/port.h +++ b/3rdparty/protobuf/src/google/protobuf/stubs/port.h @@ -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