diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 15:06:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:48:58 +0000 |
| commit | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch) | |
| tree | 96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/third_party/protobuf | |
| parent | be59a35641616a4cf23c4a13fa0632624b021c1b (diff) | |
| download | qtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz | |
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/protobuf')
3 files changed, 21 insertions, 1 deletions
diff --git a/chromium/third_party/protobuf/README.chromium b/chromium/third_party/protobuf/README.chromium index a65c311ae1c..a0fad7b1592 100644 --- a/chromium/third_party/protobuf/README.chromium +++ b/chromium/third_party/protobuf/README.chromium @@ -105,3 +105,8 @@ Description of the patches: - 0014-truncate-uint8-constants.patch Fixed upstream in CL 163270735 + +- 0017-constexpr-for-vs-2017.patch + + Define PROTOBUF_CONSTEXPR_VAR as constexpr for VS 2017, also landed upstream + as https://github.com/google/protobuf/commit/210be267fd81d5aafdc049d197d57cb45b75f3ba
\ No newline at end of file diff --git a/chromium/third_party/protobuf/patches/0017-constexpr-for-vs-2017.patch b/chromium/third_party/protobuf/patches/0017-constexpr-for-vs-2017.patch new file mode 100644 index 00000000000..39299dcc674 --- /dev/null +++ b/chromium/third_party/protobuf/patches/0017-constexpr-for-vs-2017.patch @@ -0,0 +1,14 @@ +diff --git a/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h b/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h +index 557c57d35cb4..5fa041612a0b 100644 +--- a/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h ++++ b/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h +@@ -39,7 +39,8 @@ + // We require C++11 and Clang to use constexpr for variables, as GCC 4.8 + // requires constexpr to be consistent between declarations of variables + // unnecessarily (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58541). +-#ifdef __clang__ ++// VS 2017 Update 3 also supports this usage of constexpr. ++#if defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1911) + #define PROTOBUF_CONSTEXPR_VAR constexpr + #else // !__clang__ + #define PROTOBUF_CONSTEXPR_VAR diff --git a/chromium/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h b/chromium/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h index 557c57d35cb..5fa041612a0 100644 --- a/chromium/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h +++ b/chromium/third_party/protobuf/src/google/protobuf/generated_message_table_driven.h @@ -39,7 +39,8 @@ // We require C++11 and Clang to use constexpr for variables, as GCC 4.8 // requires constexpr to be consistent between declarations of variables // unnecessarily (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58541). -#ifdef __clang__ +// VS 2017 Update 3 also supports this usage of constexpr. +#if defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1911) #define PROTOBUF_CONSTEXPR_VAR constexpr #else // !__clang__ #define PROTOBUF_CONSTEXPR_VAR |