commit 76f4e0b69f9f73cbbc3b85ca94efe5622b6d918f
author Louis Dionne <ldionne.2@gmail.com> Thu Sep 09 13:23:26 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Thu Sep 09 10:25:41 2021 -0700
tree 037f851d7842a4b7c318b0d88057604c3befa12e
parent 96fc5f56f52c6adea22001e3df149d3d452b13c0

[libc++][NFC] Move __char_traits_length_checked outside of wchar_t definitions

This will simplify an upcoming diff.

NOKEYCHECK=True
GitOrigin-RevId: 720b5560364d07a7ea85527f5a700481ece0a3aa

include/__string

diff --git a/include/__string b/include/__string
index b77a7fb..a23e7c9 100644
--- a/include/__string
+++ b/include/__string
@@ -497,18 +497,6 @@
 #endif
 }
 
-
-template <class _Traits>
-_LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-inline size_t __char_traits_length_checked(const typename _Traits::char_type* __s) _NOEXCEPT {
-#if _LIBCPP_DEBUG_LEVEL >= 1
-  return __s ? _Traits::length(__s) : (_VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, "p == nullptr", "null pointer pass to non-null argument of char_traits<...>::length")), 0);
-#else
-  return _Traits::length(__s);
-#endif
-}
-
 inline _LIBCPP_CONSTEXPR_AFTER_CXX14
 size_t
 char_traits<wchar_t>::length(const char_type* __s) _NOEXCEPT
@@ -546,6 +534,16 @@
 #endif
 }
 
+template <class _Traits>
+_LIBCPP_INLINE_VISIBILITY
+_LIBCPP_CONSTEXPR
+inline size_t __char_traits_length_checked(const typename _Traits::char_type* __s) _NOEXCEPT {
+#if _LIBCPP_DEBUG_LEVEL >= 1
+  return __s ? _Traits::length(__s) : (_VSTD::__libcpp_debug_function(_VSTD::__libcpp_debug_info(__FILE__, __LINE__, "p == nullptr", "null pointer pass to non-null argument of char_traits<...>::length")), 0);
+#else
+  return _Traits::length(__s);
+#endif
+}
 
 #ifndef _LIBCPP_HAS_NO_CHAR8_T