Adding upstream version 126.0.upstream/126.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 11 deletions

diff --git a/build/moz.configure/warnings.configure b/build/moz.configure/warnings.configure
index 9340c9e6ab..b33ede9fbb 100644
--- a/build/moz.configure/warnings.configure
+++ b/build/moz.configure/warnings.configure
@@ -36,9 +36,6 @@ add_warning("-W3", when=depends(c_compiler)(lambda c: c.type == "clang-cl"))
 # catch implicit truncation of enum values assigned to smaller bit fields
 check_and_add_warning("-Wbitfield-enum-conversion")
 
-# catches deprecated implicit capture of `this` in lambdas.
-check_and_add_warning("-Wdeprecated-this-capture", cxx_compiler)
-
 # catches bugs, e.g. "if (c); foo();", few false positives
 add_warning("-Wempty-body")
 
@@ -98,19 +95,15 @@ check_and_add_warning("-Wno-range-loop-analysis")
 
 # Enable some C++20 compat warnings. We can remove these flags after we compile
 # as C++20 (bug 1768116), because they will be enabled by default:
-check_and_add_warning("-Wc++2a-compat", cxx_compiler)
 check_and_add_warning("-Wcomma-subscript", cxx_compiler)
 check_and_add_warning("-Wenum-compare-conditional")
 check_and_add_warning("-Wenum-float-conversion")
 check_and_add_warning("-Wvolatile", cxx_compiler)
 
-# Downgrade some C++20 warnings-as-errors to warnings that we can fix after we
-# compile as C++20 (bug 1768116). They don't need to block upgrading to C++20.
-check_and_add_warning("-Wno-error=deprecated", cxx_compiler)
-check_and_add_warning("-Wno-error=deprecated-anon-enum-enum-conversion", cxx_compiler)
-check_and_add_warning("-Wno-error=deprecated-enum-enum-conversion", cxx_compiler)
-check_and_add_warning("-Wno-error=deprecated-pragma", cxx_compiler)
-check_and_add_warning("-Wno-error=deprecated-this-capture", cxx_compiler)
+# Disable some C++20 errors to be fixed in bugs 1791958, 1791955, and 1775161.
+check_and_add_warning("-Wno-deprecated-anon-enum-enum-conversion", cxx_compiler)
+check_and_add_warning("-Wno-deprecated-enum-enum-conversion", cxx_compiler)
+check_and_add_warning("-Wno-deprecated-this-capture", cxx_compiler)
 
 # catches possible misuse of the comma operator
 check_and_add_warning("-Wcomma", cxx_compiler)