diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-18 20:44:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-18 20:44:34 +0300 |
| commit | 11cd9b91a2cf3e71cb6dae0a08dff2b878163ce8 (patch) | |
| tree | c5fed987eeece9706957ecb3e47559e4a89f4923 /indra/llcommon/stdtypes.h | |
| parent | d3d8513c3b5a7f25adac777d9d59896d8dbd14c0 (diff) | |
| parent | 1c3ce46d34293f0e1dc5887ef98b05921af663c9 (diff) | |
Merge pull request #3914 from secondlife/marchcat/05-develop
develop → 2025.05 sync
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 |