diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-04-18 21:36:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-18 21:36:56 +0300 |
| commit | 9a333e65c4019540d5675e72ac57ef5ab106aab0 (patch) | |
| tree | 55fa0d6d0de4521f0d8f764bb13b2e6c069602bb /indra/llcommon/stdtypes.h | |
| parent | 3d5f1541dd9980196ba0c8a3c3396c8ed3384d1e (diff) | |
| parent | 4cccf8af43c8ebd9f947b9050a0403f65d0de7ee (diff) | |
Merge develop into release/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 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 |