diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 18:45:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 18:45:54 +0300 |
| commit | 428f21cf795f440f69a772b314f877ea0c6d4741 (patch) | |
| tree | bc9cea56b8e236f52df392084552018c387cff2c /indra/llcommon/llstring.h | |
| parent | 09454c53a48e88a9cdd54f68ac507694a766b213 (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge branch 'main' into marchcat/x-merge
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index a8d910298c..5e622dc6c1 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -1215,7 +1215,7 @@ void LLStringUtilBase<T>::getTokens(const string_type& string, std::vector<strin { // This overload must deal with escapes. Delegate that to InEscString // (unless there ARE no escapes). - boost::scoped_ptr< LLStringUtilBaseImpl::InString<T> > instrp; + std::unique_ptr< LLStringUtilBaseImpl::InString<T> > instrp; if (escapes.empty()) instrp.reset(new LLStringUtilBaseImpl::InString<T>(string.begin(), string.end())); else |