diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-16 15:25:25 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-16 15:25:25 -0400 |
commit | 78d985c154b0d71064b89891f5b2005e48c300ce (patch) | |
tree | c43bc6be58ec9b30f0f4dfaa6c027736fb331582 /indra/llcommon/llsd.h | |
parent | 6c2a278c3dbd9d0660be5e9f6ec1c756af7cb992 (diff) | |
parent | a3cbd41543258818589dd0e368c68d2dc62b3398 (diff) |
Merge branch 'main' into release/luau-scripting
Diffstat (limited to 'indra/llcommon/llsd.h')
-rw-r--r-- | indra/llcommon/llsd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h index cdb9a7ed8a..8ed254919c 100644 --- a/indra/llcommon/llsd.h +++ b/indra/llcommon/llsd.h @@ -197,12 +197,12 @@ public: typename std::enable_if<std::is_integral<VALUE>::value && ! std::is_same<VALUE, Boolean>::value, bool>::type = true> - LLSD(VALUE v): LLSD(Integer(narrow(v))) {} + LLSD(VALUE v): LLSD(Integer(narrow<VALUE>(v))) {} // support construction from F32 et al. template <typename VALUE, typename std::enable_if<std::is_floating_point<VALUE>::value, bool>::type = true> - LLSD(VALUE v): LLSD(Real(narrow(v))) {} + LLSD(VALUE v): LLSD(Real(narrow<VALUE>(v))) {} //@} /** @name Scalar Assignment */ |