[libc] Move CharacterConverter template specialization to cpp file

[uzairnawaz]

Fixes build errors caused by #152204

[llvmbot]

@llvm/pr-subscribers-libc

Author: Uzair Nawaz (uzairnawaz)

Changes

Fixes build errors caused by #152204

---

Full diff: https://github.com/llvm/llvm-project/pull/152405.diff

2 Files Affected:

• (modified) libc/src/__support/wchar/character_converter.cpp (+8)
• (modified) libc/src/__support/wchar/character_converter.h (-4)

diff --git a/libc/src/__support/wchar/character_converter.cpp b/libc/src/__support/wchar/character_converter.cpp
index 278248c5c4c4a..26672884d7b16 100644
--- a/libc/src/__support/wchar/character_converter.cpp
+++ b/libc/src/__support/wchar/character_converter.cpp
@@ -164,5 +164,13 @@ ErrorOr<char8_t> CharacterConverter::pop_utf8() {
   return static_cast<char8_t>(output);
 }
 
+template <> ErrorOr<char8_t> CharacterConverter::pop() { return pop_utf8(); }
+template <> ErrorOr<char32_t> CharacterConverter::pop() { return pop_utf32(); }
+
+template <> size_t CharacterConverter::sizeAs<char8_t>() {
+  return state->total_bytes;
+}
+template <> size_t CharacterConverter::sizeAs<char32_t>() { return 1; }
+
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/src/__support/wchar/character_converter.h b/libc/src/__support/wchar/character_converter.h
index fef30f7ce43fa..2cc28abf2772a 100644
--- a/libc/src/__support/wchar/character_converter.h
+++ b/libc/src/__support/wchar/character_converter.h
@@ -33,8 +33,6 @@ class CharacterConverter {
   bool isValidState();
 
   template <typename CharType> size_t sizeAs();
-  template <> size_t sizeAs<char8_t>() { return state->total_bytes; }
-  template <> size_t sizeAs<char32_t>() { return 1; }
 
   int push(char8_t utf8_byte);
   int push(char32_t utf32);
@@ -42,8 +40,6 @@ class CharacterConverter {
   ErrorOr<char8_t> pop_utf8();
   ErrorOr<char32_t> pop_utf32();
   template <typename CharType> ErrorOr<CharType> pop();
-  template <> ErrorOr<char8_t> pop() { return pop_utf8(); }
-  template <> ErrorOr<char32_t> pop() { return pop_utf32(); }
 };
 
 } // namespace internal

[michaelrj-google]

LGTM to unbreak the buildbots