From d511ff7365284a4475b1d729cf3448d378c83341 Mon Sep 17 00:00:00 2001 From: Nicky Dasmijn Date: Sun, 29 Sep 2024 00:59:41 +0200 Subject: 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. --- indra/llui/lltexteditor.cpp | 4 +--- indra/llui/lltexteditor.h | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'indra') 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(const LLWString & clean_string) +void LLTextEditor::pasteTextWithLinebreaksImpl(const LLWString & clean_string) { std::basic_string::size_type start = 0; std::basic_string::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 void pasteTextWithLinebreaks(const STRINGTYPE& clean_string) { - pasteTextWithLinebreaks(ll_convert(clean_string)); + pasteTextWithLinebreaksImpl(ll_convert(clean_string)); } - template <> - void pasteTextWithLinebreaks(const LLWString & clean_string); + void pasteTextWithLinebreaksImpl(const LLWString & clean_string); private: void onKeyStroke(); -- cgit v1.2.3