Moved cv check into static assert

microsoft · Feb 18, 2023 · 546023b · 546023b
1 parent 7c4e44c
commit 546023b
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/stl/inc/ranges b/stl/inc/ranges
@@ -8399,15 +8399,11 @@ 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 (_Is_cv_unqualified<_Container> && !view<_Container>)
+        requires (!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");
         if constexpr (_Converts_direct_constructible<_Rng, _Container, _Types...>) {
             return _Container(_STD forward<_Rng>(_Range), _STD forward<_Types>(_Args)...);
         } else if constexpr (_Converts_tag_constructible<_Rng, _Container, _Types...>) {
@@ -8433,7 +8429,8 @@ namespace ranges {
 
     template <class _Container>
     struct _To_class_fn {
-        _STL_INTERNAL_STATIC_ASSERT(_Is_cv_unqualified<_Container>);
+        _STL_INTERNAL_STATIC_ASSERT(!is_const_v<_Container>);
+        _STL_INTERNAL_STATIC_ASSERT(!is_volatile_v<_Container>);
         _STL_INTERNAL_STATIC_ASSERT(!view<_Container>);
 
         template <input_range _Rng, class... _Types>
@@ -8445,8 +8442,10 @@ namespace ranges {
     };
 
     _EXPORT_STD template <class _Container, class... _Types>
-        requires (_Is_cv_unqualified<_Container> && !view<_Container>)
+        requires (!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");
         return _Range_closure<_To_class_fn<_Container>, decay_t<_Types>...>{_STD forward<_Types>(_Args)...};
     }