From 5486d87b566aabb43fa585de3ee86e5bc77391c9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 19 Feb 2024 15:44:40 +0100 Subject: Change LLPreeditor::standouts_t to std::deque since std::vector since it's a specialization that does not necessarily behave like standard STL containers --- indra/llui/lllineeditor.cpp | 2 +- indra/llui/lltexteditor.h | 2 +- indra/llwindow/llpreeditor.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index a1b9b5696c..9b320fdf97 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -2590,7 +2590,7 @@ void LLLineEditor::markAsPreedit(S32 position, S32 length) mPreeditPositions[0] = position; mPreeditPositions[1] = position + length; mPreeditStandouts.resize(1); - mPreeditStandouts[0] = FALSE; + mPreeditStandouts[0] = false; } else { diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index 2b1986ff41..26d61b9502 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -276,7 +276,7 @@ protected: LLWString mPreeditWString; LLWString mPreeditOverwrittenWString; std::vector mPreeditPositions; - std::vector mPreeditStandouts; + LLPreeditor::standouts_t mPreeditStandouts; protected: LLUIColor mDefaultColor; diff --git a/indra/llwindow/llpreeditor.h b/indra/llwindow/llpreeditor.h index 2be1290c02..7f1daefdac 100644 --- a/indra/llwindow/llpreeditor.h +++ b/indra/llwindow/llpreeditor.h @@ -34,7 +34,7 @@ class LLPreeditor public: typedef std::vector segment_lengths_t; - typedef std::vector standouts_t; + typedef std::deque standouts_t; // We don't delete against LLPreeditor, but compilers complain without this... -- cgit v1.2.3