Merge branch 'u8string' into v4_1_0

ToruNiina · Jul 20, 2024 · f3a1586 · f3a1586
2 parents 098569a + 43f5a74
commit f3a1586
Show file tree

Hide file tree

Showing 6 changed files with 231 additions and 208 deletions.
diff --git a/include/toml11/get.hpp b/include/toml11/get.hpp
@@ -119,10 +119,7 @@ cxx::enable_if_t<cxx::conjunction<
     >::value, T>
 get(const basic_value<TC>& v)
 {
-    using value_type     = typename cxx::remove_cvref_t<T>::value_type;
-    using traits_type    = typename cxx::remove_cvref_t<T>::traits_type;
-    using allocator_type = typename cxx::remove_cvref_t<T>::allocator_type;
-    return detail::to_string_of<value_type, traits_type, allocator_type>(v.as_string());
+    return detail::string_conv<cxx::remove_cvref_t<T>>(v.as_string());
 }
 
 // ============================================================================

diff --git a/include/toml11/parser.hpp b/include/toml11/parser.hpp
@@ -1701,7 +1701,7 @@ parse_simple_key(location& loc, const context<TC>& ctx)
 
     if(const auto bare = syntax::unquoted_key(spec).scan(loc))
     {
-        return ok(to_string_of<typename key_type::value_type>(bare.as_string()));
+        return ok(string_conv<key_type>(bare.as_string()));
     }
     else
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -1701,7 +1701,7 @@ parse_simple_key(location& loc, const context<TC>& ctx) @@
         if(const auto bare = syntax::unquoted_key(spec).scan(loc))
         {
-            return ok(to_string_of<typename key_type::value_type>(bare.as_string()));
+            return ok(string_conv<key_type>(bare.as_string()));
         }
         else
         {
@@ Expand Down @@