diff options
Diffstat (limited to 'indra/llcommon/llsdjson.cpp')
| -rw-r--r-- | indra/llcommon/llsdjson.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcommon/llsdjson.cpp b/indra/llcommon/llsdjson.cpp index a4b45ed80d..e42bac4c70 100644 --- a/indra/llcommon/llsdjson.cpp +++ b/indra/llcommon/llsdjson.cpp @@ -26,14 +26,12 @@ // Must turn on conditional declarations in header file so definitions end up // with proper linkage. -#define LLSD_DEBUG_INFO #include "linden_common.h" #include "llsdjson.h" #include "llsdutil.h" #include "llerror.h" -#include "../llmath/llmath.h" #if LL_WINDOWS #include <boost/json.hpp> @@ -70,7 +68,7 @@ LLSD LlsdFromJson(const boost::json::value& val) const boost::json::array& array = val.as_array(); size_t size = array.size(); // allocate elements 0 .. (size() - 1) to avoid incremental allocation - if (! array.empty()) + if (!array.empty()) { result[size - 1] = LLSD(); } @@ -84,7 +82,7 @@ LLSD LlsdFromJson(const boost::json::value& val) result = LLSD::emptyMap(); for (const auto& element : val.as_object()) { - result[element.key()] = LlsdFromJson(element.value()); + result[std::string_view(element.key())] = LlsdFromJson(element.value()); } break; } |