diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/numerics/safe_conversions.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/numerics/safe_conversions.h')
| -rw-r--r-- | chromium/base/numerics/safe_conversions.h | 4 |
1 files changed, 2 insertions, 2 deletions
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<Dst>::value && SaturateFastAsmOp<Dst, Src>::is_supported>::type> { static const bool is_supported = true; - static Dst Do(Src value) { return SaturateFastAsmOp<Dst, Src>::Do(value); } + static constexpr Dst Do(Src value) { return SaturateFastAsmOp<Dst, Src>::Do(value); } }; template <typename Dst, typename Src> @@ -181,7 +181,7 @@ struct SaturateFastOp< std::is_integral<Dst>::value && !SaturateFastAsmOp<Dst, Src>::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. |