diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:38:06 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:38:06 -0400 |
commit | 041005f2860808bb807483775635abcd8c54fecf (patch) | |
tree | 57cce285218550dd2c0378ac8bf0c1c1d856701e /indra/llcommon/llleap.cpp | |
parent | 1be9d68468e51be7de5b632f0276dc6708e75dc6 (diff) | |
parent | b61ea595b5f2cac0f108b05526f0a371f512bfd4 (diff) |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
Diffstat (limited to 'indra/llcommon/llleap.cpp')
-rw-r--r-- | indra/llcommon/llleap.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp index 2704f8b6de..c87c0758fe 100644 --- a/indra/llcommon/llleap.cpp +++ b/indra/llcommon/llleap.cpp @@ -231,7 +231,8 @@ public: } |*==========================================================================*/ - LL_DEBUGS("EventHost") << "Sending: " << buffer.tellp() << ':'; + LL_DEBUGS("EventHost") << "Sending: " + << static_cast<U64>(buffer.tellp()) << ':'; std::string::size_type truncate(80); if (buffer.tellp() <= truncate) { @@ -244,7 +245,8 @@ public: LL_CONT << LL_ENDL; LLProcess::WritePipe& childin(mChild->getWritePipe(LLProcess::STDIN)); - childin.get_ostream() << buffer.tellp() << ':' << buffer.str() << std::flush; + childin.get_ostream() << static_cast<U64>(buffer.tellp()) + << ':' << buffer.str() << std::flush; return false; } |