summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdserialize.cpp
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2023-03-03 17:34:03 -0500
committerGitHub <noreply@github.com>2023-03-03 17:34:03 -0500
commitf2a784f0d07ac8bedb4e84f8ce60bfbe513d7dfb (patch)
tree9789b0035169b494e360d47ec2449a7614cd36c8 /indra/llcommon/llsdserialize.cpp
parentd9ef67187532f528a0a8072da55ac0237ec3e4ff (diff)
parent42b1fd21814e679a1557e0d5a55943c5b0e63723 (diff)
Merge pull request #99 from secondlife/sl-18330-fixes
SL-18330: Address further code review comments
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rw-r--r--indra/llcommon/llsdserialize.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index a14a6b5b1b..046523dbb1 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -143,7 +143,7 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, llssize max_bytes)
// byte. We could store one if needed, since even the incremented
// inbuf won't exceed sizeof(hdr_buf)-1, but there's no need.
}
- std::string header{ hdr_buf, inbuf };
+ std::string header{ hdr_buf, static_cast<std::string::size_type>(inbuf) };
if (str.fail())
{
str.clear();