diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-19 22:07:21 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-19 22:12:00 +0800 |
| commit | ba20ac5718de63c499fe08ea4079695962dc2f17 (patch) | |
| tree | 88c7b17304445278adb73135e2794a2afa3aa20f /indra/llcommon/stdtypes.h | |
| parent | ad9c801edb13568657c0964ebfb74257da6d9e00 (diff) | |
| parent | 11cd9b91a2cf3e71cb6dae0a08dff2b878163ce8 (diff) | |
Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05
Diffstat (limited to 'indra/llcommon/stdtypes.h')
| -rw-r--r-- | indra/llcommon/stdtypes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h index b40a718593..78d5e50e4b 100644 --- a/indra/llcommon/stdtypes.h +++ b/indra/llcommon/stdtypes.h @@ -169,14 +169,14 @@ private: FROM mValue; public: - narrow(FROM value): mValue(value) {} + constexpr narrow(FROM value): mValue(value) {} /*---------------------- Narrowing unsigned to signed ----------------------*/ template <typename TO, typename std::enable_if<std::is_unsigned<FROM>::value && std::is_signed<TO>::value, bool>::type = true> - inline + constexpr operator TO() const { // The reason we skip the @@ -194,7 +194,7 @@ public: typename std::enable_if<! (std::is_unsigned<FROM>::value && std::is_signed<TO>::value), bool>::type = true> - inline + constexpr operator TO() const { // two different assert()s so we can tell which condition failed |