diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-03 11:25:17 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-03 10:40:26 +0000 |
| commit | c34649b6774ea6cd162049e1242abece13f3a1a7 (patch) | |
| tree | 8cc9b36ee83ea96f9d99123cc468399422a0e0ab | |
| parent | bb283cc6493cb612952ada21094a6f7777ac1f26 (diff) | |
FIXUP: Fix build with g++ < 6v5.10.0-beta4
Work-around type-cast quirks in g++ 4.8
Change-Id: I30d128d90a2ac2c5464d2898fb3c6da448dda311
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | chromium/gpu/config/gpu_control_list.cc | 2 | ||||
| -rw-r--r-- | chromium/third_party/WebKit/Source/platform/blob/BlobData.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/gpu/config/gpu_control_list.cc b/chromium/gpu/config/gpu_control_list.cc index 339eaa0c0b2..9518edd7e99 100644 --- a/chromium/gpu/config/gpu_control_list.cc +++ b/chromium/gpu/config/gpu_control_list.cc @@ -97,7 +97,7 @@ int CompareLexicalNumberStrings( bool StringMismatch(const std::string& input, const std::string& pattern) { if (input.empty() || pattern.empty()) return false; - return !RE2::FullMatch(input, pattern); + return !RE2::FullMatch(input, re2::StringPiece(pattern)); } bool StringMismatch(const std::string& input, const char* pattern) { diff --git a/chromium/third_party/WebKit/Source/platform/blob/BlobData.cpp b/chromium/third_party/WebKit/Source/platform/blob/BlobData.cpp index 1684392ca43..220af564026 100644 --- a/chromium/third_party/WebKit/Source/platform/blob/BlobData.cpp +++ b/chromium/third_party/WebKit/Source/platform/blob/BlobData.cpp @@ -287,7 +287,7 @@ BlobDataHandle::BlobDataHandle(std::unique_ptr<BlobData> data, long long size) size_t current_memory_population = 0; Vector<DataElementPtr> elements; - const DataElementPtr null_element = nullptr; + const DataElementPtr null_element(nullptr); BlobBytesProvider* last_bytes_provider = nullptr; // TODO(mek): When the mojo code path is the default BlobData should |