summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-22 15:30:29 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-11-24 10:15:57 +0000
commita3547302740474d0659b258955be5c5f87e574ad (patch)
treee94b381f4c998c368feaef24bcdef6d9056205e0
parent245d7217c51aad073a79e0fbf0dbcb6ffbbeff4d (diff)
downloadqtwebengine-chromium-a3547302740474d0659b258955be5c5f87e574ad.tar.gz
FIXUP: Silence most warnings
Change-Id: I3fb589d44a9e71a41bfe16c20e9f41b0b87f744d Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/444697 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-rw-r--r--chromium/build/config/compiler/BUILD.gn1
-rw-r--r--chromium/third_party/blink/renderer/platform/text/segmented_string.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index 3f6ce9f4117..86bb638bf69 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -362,6 +362,7 @@ config("compiler") {
"-Wno-unknown-argument",
"-Wno-unknown-attributes",
"-Wno-unknown-warning-option",
+ "-Wno-predefined-identifier-outside-function",
]
cflags_cc += [
"-Wno-parentheses-equality",
diff --git a/chromium/third_party/blink/renderer/platform/text/segmented_string.h b/chromium/third_party/blink/renderer/platform/text/segmented_string.h
index 386e6375d74..722ecf63cf6 100644
--- a/chromium/third_party/blink/renderer/platform/text/segmented_string.h
+++ b/chromium/third_party/blink/renderer/platform/text/segmented_string.h
@@ -138,12 +138,12 @@ class PLATFORM_EXPORT SegmentedSubstring {
ALWAYS_INLINE int offset() const {
DCHECK_LE(data_start_, data_.string8_ptr);
- return static_cast<int>(data_.string8_ptr - data_start_) >> !is_8bit_;
+ return static_cast<int>(data_.string8_ptr - data_start_) >> (!is_8bit_ ? 1 : 0);
}
ALWAYS_INLINE int length() const {
DCHECK_LE(data_.string8_ptr, data_last_char_);
- return static_cast<int>(data_end() - data_.string8_ptr) >> !is_8bit_;
+ return static_cast<int>(data_end() - data_.string8_ptr) >> (!is_8bit_ ? 1 : 0);
}
private: