diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:30:08 +0300 |
| commit | 8701e0973450da9c3c1dd905e73011bdeb09c93e (patch) | |
| tree | aecadf995f0174cc41f7cb9846a1382a930d8f82 /indra/llcommon/llsd.h | |
| parent | 37392be4171303db08a4842b7882b4cb758a8f8d (diff) | |
| parent | 8fa956a16e616191e21bf001eabc4670453debcd (diff) | |
Merge pull request #1178 from secondlife/marchcat/b-merge
Release (Maint W) -> Maint B merge
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 */ |