diff options
author | Nicky Dasmijn <nicky.dasmijn@posteo.nl> | 2024-09-29 00:59:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-29 01:59:41 +0300 |
commit | d511ff7365284a4475b1d729cf3448d378c83341 (patch) | |
tree | 065fe0d7276372c001ac6d87d0f3be5d96570090 /indra/llui | |
parent | 9e8cf72a355d5353564c0199990a6b5073f37fca (diff) |
Linux/GCC 13 build fix for template specialization of pasteTextWithLinebreaks (#2729)
GCC 13 did not like having a template<> inside the class body at all.
Thus turn the specialization of pasteTextWithLinebreaks into a
class methode pasteTextWithLinebreaksImpl.
Diffstat (limited to 'indra/llui')
-rw-r--r-- | indra/llui/lltexteditor.cpp | 4 | ||||
-rw-r--r-- | indra/llui/lltexteditor.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index c8cde90032..ecac800def 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -1594,9 +1594,7 @@ void LLTextEditor::cleanStringForPaste(LLWString & clean_string) } } - -template <> -void LLTextEditor::pasteTextWithLinebreaks<LLWString>(const LLWString & clean_string) +void LLTextEditor::pasteTextWithLinebreaksImpl(const LLWString & clean_string) { std::basic_string<llwchar>::size_type start = 0; std::basic_string<llwchar>::size_type pos = clean_string.find('\n',start); diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index 765c88a933..fab46a00e3 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -313,10 +313,9 @@ public: template <typename STRINGTYPE> void pasteTextWithLinebreaks(const STRINGTYPE& clean_string) { - pasteTextWithLinebreaks<LLWString>(ll_convert(clean_string)); + pasteTextWithLinebreaksImpl(ll_convert(clean_string)); } - template <> - void pasteTextWithLinebreaks<LLWString>(const LLWString & clean_string); + void pasteTextWithLinebreaksImpl(const LLWString & clean_string); private: void onKeyStroke(); |