From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/numerics/safe_conversions.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chromium/base/numerics/safe_conversions.h') diff --git a/chromium/base/numerics/safe_conversions.h b/chromium/base/numerics/safe_conversions.h index b9636fec428..b9f81e85b85 100644 --- a/chromium/base/numerics/safe_conversions.h +++ b/chromium/base/numerics/safe_conversions.h @@ -170,7 +170,7 @@ struct SaturateFastOp< std::is_integral::value && SaturateFastAsmOp::is_supported>::type> { static const bool is_supported = true; - static Dst Do(Src value) { return SaturateFastAsmOp::Do(value); } + static constexpr Dst Do(Src value) { return SaturateFastAsmOp::Do(value); } }; template @@ -181,7 +181,7 @@ struct SaturateFastOp< std::is_integral::value && !SaturateFastAsmOp::is_supported>::type> { static const bool is_supported = true; - static Dst Do(Src value) { + static constexpr Dst Do(Src value) { // The exact order of the following is structured to hit the correct // optimization heuristics across compilers. Do not change without // checking the emitted code. -- cgit v1.2.1