Fix incompatibility with Xcode 16+ and c++20 after merge

brad-linden · brad-linden · commit 9bdb4eb59385 · 2025-01-21T12:23:24.000-08:00
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp
@@ -645,7 +645,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll
         if (error == FT_Err_Out_Of_Memory)
         {
             LLError::LLUserWarningMsg::showOutOfMemory();
-            LL_ERRS() << "Out of memory loading glyph for character " << wch << LL_ENDL;
+            LL_ERRS() << "Out of memory loading glyph for character " << llformat("U+%xu", U32(wch)) << LL_ENDL;
         }
 
         std::string message = llformat(

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll`
`645`	`645`	`if (error == FT_Err_Out_Of_Memory)`
`646`	`646`	`{`
`647`	`647`	`LLError::LLUserWarningMsg::showOutOfMemory();`
`648`		`- LL_ERRS() << "Out of memory loading glyph for character " << wch << LL_ENDL;`
	`648`	`+ LL_ERRS() << "Out of memory loading glyph for character " << llformat("U+%xu", U32(wch)) << LL_ENDL;`
`649`	`649`	`}`
`650`	`650`
`651`	`651`	`std::string message = llformat(`