diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-09-12 09:29:26 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-09-12 09:29:26 -0400 |
| commit | 5ed44adec58ba2ecb8dd073122bd8882fed30638 (patch) | |
| tree | 416c97837d179d555ecbab18fc7f59071ab01be8 /indra | |
| parent | b5cba166b7bd6859fe3c7a0d81d7177cb79c74bd (diff) | |
DRTVWR-588: Fix a couple merge glitches in llsdserialize_test.cpp.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/tests/llsdserialize_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index c87deb8ffe..341b0d5609 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1948,7 +1948,7 @@ namespace tut { writeLLSDArray(serialize, out, cdata); }); python("read C++ " + desc, - [this, pydata, &file](std::ostream& out) { + [pydata, &file](std::ostream& out) { out << import_llsd << "from functools import partial\n" @@ -2062,7 +2062,7 @@ namespace tut NamedTempFile file("llsd", ""); python("Python " + pyformatter, - [this, &file](std::ostream& out) { + [pyformatter, &file](std::ostream& out) { out << import_llsd << "import struct\n" @@ -2081,7 +2081,7 @@ namespace tut " for item in DATA:\n" " serialized = llsd." << pyformatter << "(item)\n" " f.write(lenformat.pack(len(serialized)))\n" - " f.write(serialized)\n"); + " f.write(serialized)\n";}); std::ifstream inf(file.getName().c_str()); LLSD item; |