Merge branch 'main' of https://github.com/mlemacio/MicrosoftSTL into L…

…WG-3847
microsoft · Feb 18, 2023 · b5c6076 · b5c6076
2 parents 9f8d25f + 99b4c1f
commit b5c6076
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/stl/inc/format b/stl/inc/format
@@ -3364,10 +3364,6 @@ struct formatter<const _CharT*, _CharT>
 template <_Format_supported_charT _CharT, size_t _Nx>
 struct formatter<_CharT[_Nx], _CharT> : _Formatter_base<_CharT[_Nx], _CharT, _Basic_format_arg_type::_CString_type> {};
 
-template <_Format_supported_charT _CharT, size_t _Nx>
-struct formatter<const _CharT[_Nx], _CharT>
-    : _Formatter_base<_CharT[_Nx], _CharT, _Basic_format_arg_type::_CString_type> {};
-
 template <_Format_supported_charT _CharT, class _Traits, class _Allocator>
 struct formatter<basic_string<_CharT, _Traits, _Allocator>, _CharT>
     : _Formatter_base<basic_string<_CharT, _Traits, _Allocator>, _CharT, _Basic_format_arg_type::_String_type> {};

diff --git a/stl/inc/ranges b/stl/inc/ranges
@@ -8399,8 +8399,14 @@ namespace ranges {
         }
     }
 
+    // clang-format off
+    template <class _Container>
+    concept _Is_cv_unqualified = !is_const_v<_Container> && !is_volatile_v<_Container>;
+    // clang-format on
+
+
     _EXPORT_STD template <class _Container, input_range _Rng, class... _Types>
-        requires (!view<_Container>)
+        requires (_Is_cv_unqualified<_Container> && !view<_Container>)
     _NODISCARD constexpr _Container to(_Rng&& _Range, _Types&&... _Args) {
         static_assert(!is_const_v<_Container>, "the target type must be cv-unqualified");
         static_assert(!is_volatile_v<_Container>, "the target type must be cv-unqualified");
@@ -8442,7 +8448,7 @@ namespace ranges {
     };
 
     _EXPORT_STD template <class _Container, class... _Types>
-        requires (!view<_Container>)
+        requires (_Is_cv_unqualified<_Container> && !view<_Container>)
     _NODISCARD constexpr auto to(_Types&&... _Args) {
         static_assert(!is_const_v<_Container>, "the target type must be cv-unqualified");
         static_assert(!is_volatile_v<_Container>, "the target type must be cv-unqualified");