diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 22:19:14 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-18 22:19:14 +0000 |
| commit | 030d61ac58be38f9f8aafeb68b383d88d670080b (patch) | |
| tree | 79af0678906bf9e05316614d52b4cf5e97d1adc2 /indra/llcommon/llsdutil.cpp | |
| parent | 6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merged in D559-merge-6.5.5 (pull request #946)
DRTVWR-559 merge up to 6.5.5
Diffstat (limited to 'indra/llcommon/llsdutil.cpp')
| -rw-r--r-- | indra/llcommon/llsdutil.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index eb3a96b133..fc10fcece3 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -29,6 +29,7 @@ #include "linden_common.h" #include "llsdutil.h" +#include <sstream> #if LL_WINDOWS # define WIN32_LEAN_AND_MEAN @@ -862,7 +863,7 @@ bool llsd_equals(const LLSD& lhs, const LLSD& rhs, int bits) namespace llsd { -LLSD& drill(LLSD& blob, const LLSD& rawPath) +LLSD& drill_ref(LLSD& blob, const LLSD& rawPath) { // Treat rawPath uniformly as an array. If it's not already an array, // store it as the only entry in one. (But let's say Undefined means an @@ -917,9 +918,9 @@ LLSD& drill(LLSD& blob, const LLSD& rawPath) LLSD drill(const LLSD& blob, const LLSD& path) { - // non-const drill() does exactly what we want. Temporarily cast away + // drill_ref() does exactly what we want. Temporarily cast away // const-ness and use that. - return drill(const_cast<LLSD&>(blob), path); + return drill_ref(const_cast<LLSD&>(blob), path); } } // namespace llsd |