diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-04-25 16:40:38 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2025-04-25 16:40:38 +0300 |
| commit | a7759f370435bdd971724aa799160fa28ae112b5 (patch) | |
| tree | d5c63558fd34311ba70a4f0ceafcca8a8565f0bd /indra/llcommon/stdtypes.h | |
| parent | d9468ecc59f75363d9b57a9c1f7419cc3c42599b (diff) | |
| parent | 89f817194305243cb28499c70819656b8172dfa8 (diff) | |
Merge branch 'release/2025.04' into 2025.04-chat-mention
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 28e50b3d21..f1e4c2bc78 100644 --- a/indra/llcommon/stdtypes.h +++ b/indra/llcommon/stdtypes.h @@ -164,14 +164,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 @@ -189,7 +189,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 |