projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a55aed5)
Re-apply protobuf fix for JavaScript builds
authorDmitry Kurtaev <dmitry.kurtaev+github@gmail.com>
Sat, 2 Dec 2017 20:52:35 +0000 (23:52 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 17 Jan 2018 20:20:00 +0000 (20:20 +0000)
original commit: f5035150824c49d3a2d7cb7ce69ac1ffbdf8c63d
JavaScript bindings for dnn module

3rdparty/protobuf/src/google/protobuf/stubs/port.h patch | blob | history

diff --git a/3rdparty/protobuf/src/google/protobuf/stubs/port.h b/3rdparty/protobuf/src/google/protobuf/stubs/port.h
index cecefdc..658c969 100644 (file)
--- 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
Domain: Multimedia / Media Vision;