diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/third_party/protobuf | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/protobuf')
3 files changed, 16 insertions, 0 deletions
diff --git a/chromium/third_party/protobuf/README.chromium b/chromium/third_party/protobuf/README.chromium index d5d87caa17f..83ba438a7f5 100644 --- a/chromium/third_party/protobuf/README.chromium +++ b/chromium/third_party/protobuf/README.chromium @@ -86,3 +86,7 @@ Description of the patches: removed in C++11 mode. Fixed in https://github.com/google/protobuf/pull/1549 + +- 0012-add-map-include.patch + + Workaround for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81347 diff --git a/chromium/third_party/protobuf/patches/0012-add-map-include.patch b/chromium/third_party/protobuf/patches/0012-add-map-include.patch new file mode 100644 index 00000000000..b71ab9297b2 --- /dev/null +++ b/chromium/third_party/protobuf/patches/0012-add-map-include.patch @@ -0,0 +1,11 @@ +diff -ru protobuf2/src/google/protobuf/descriptor.h protobuf/src/google/protobuf/descriptor.h +--- protobuf2/src/google/protobuf/descriptor.h 2017-07-06 15:32:27.892104861 -0700 ++++ protobuf/src/google/protobuf/descriptor.h 2017-07-06 15:19:07.042709476 -0700 +@@ -54,6 +54,7 @@ + #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_H__ + #define GOOGLE_PROTOBUF_DESCRIPTOR_H__ + ++#include <map> + #include <memory> + #ifndef _SHARED_PTR_H + #include <google/protobuf/stubs/shared_ptr.h> diff --git a/chromium/third_party/protobuf/src/google/protobuf/descriptor.h b/chromium/third_party/protobuf/src/google/protobuf/descriptor.h index 3ecc0a9c08e..a1ba53dea95 100644 --- a/chromium/third_party/protobuf/src/google/protobuf/descriptor.h +++ b/chromium/third_party/protobuf/src/google/protobuf/descriptor.h @@ -54,6 +54,7 @@ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_H__ #define GOOGLE_PROTOBUF_DESCRIPTOR_H__ +#include <map> #include <memory> #ifndef _SHARED_PTR_H #include <google/protobuf/stubs/shared_ptr.h> |