summaryrefslogtreecommitdiff
path: root/indra/llcommon/llleap.cpp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-04-24 09:55:34 -0700
committerBrad Linden <brad@lindenlab.com>2024-04-24 09:55:34 -0700
commit86c0c1d5536897c925f4e8aa2859a160313d964c (patch)
tree9d32be1b0d6a4dd139d8a72b35a94f48046b2ffc /indra/llcommon/llleap.cpp
parentcadc1a02cc7289dabd368dd1a1d237c042e9f82e (diff)
parentd98fc504a1d4bc292ba86acdda053c8b4598a193 (diff)
Merge remote-tracking branch 'origin/main' into release/materials_featurette
Diffstat (limited to 'indra/llcommon/llleap.cpp')
-rw-r--r--indra/llcommon/llleap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index 8f88e728ce..b2b1162f63 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -462,10 +462,10 @@ private:
LLProcessPtr mChild;
LLTempBoundListener
mStdinConnection, mStdoutConnection, mStdoutDataConnection, mStderrConnection;
- boost::scoped_ptr<LLEventPump::Blocker> mBlocker;
+ std::unique_ptr<LLEventPump::Blocker> mBlocker;
LLProcess::ReadPipe::size_type mExpect;
LLError::RecorderPtr mRecorder;
- boost::scoped_ptr<LLLeapListener> mListener;
+ std::unique_ptr<LLLeapListener> mListener;
};
// These must follow the declaration of LLLeapImpl, so they may as well be last.