diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-04-03 14:08:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 14:08:01 -0400 |
| commit | f069543328efc441673db9877c97ae2201b86e91 (patch) | |
| tree | 299591b4bce2a1d6a5351d63b3ae249a130a5871 /indra/llcommon/llstring.h | |
| parent | b4d699764044301c460560f7665b623a571bf14f (diff) | |
| parent | 3f876a6a1d138c31266afb6c39df7090e304efe3 (diff) | |
Merge pull request #1110 from secondlife/lua-startup
Add `startup.lua` module with `startup.ensure()`, `startup.wait()` functions.
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 0eb2770004..14aa51cb4a 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -37,6 +37,7 @@ #include <algorithm> #include <vector> #include <map> +#include <type_traits> #include "llformat.h" #include "stdtypes.h" @@ -542,7 +543,7 @@ public: template <typename TO> inline operator TO() const { - return ll_convert_impl<TO, FROM>()(mRef); + return ll_convert_impl<TO, std::decay_t<const FROM>>()(mRef); } }; @@ -551,7 +552,7 @@ public: template<typename TO, typename FROM> TO ll_convert_to(const FROM& in) { - return ll_convert_impl<TO, FROM>()(in); + return ll_convert_impl<TO, std::decay_t<const FROM>>()(in); } // degenerate case |