diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 11:54:56 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 11:54:56 +0800 |
| commit | 11d75418fce8372e9976b069070d9d0506766d0d (patch) | |
| tree | d0fc6b405dbcffefcd85f3ba52a8248c0128acde /indra/llcommon/stdtypes.h | |
| parent | b6c3d47c007c59cbd3c9913a0b99f9d42bdb8d75 (diff) | |
| parent | 0421e7b846b03d316740d759348c3aaa723d0b14 (diff) | |
Merge branch '2025.04'
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 |