refactor: no deprecated variant2 alias from API

fix #857
boostorg · Oct 2, 2024 · e732c4c · e732c4c
1 parent 64087ba
commit e732c4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/include/boost/url/grammar/impl/variant_rule.hpp b/include/boost/url/grammar/impl/variant_rule.hpp
@@ -35,7 +35,7 @@ parse_variant(
     std::integral_constant<
         std::size_t, I> const&,
     std::false_type const&) ->
-        system::result<variant<
+        system::result<variant2::variant<
             typename R0::value_type,
             typename Rn::value_type...>>
 {
@@ -57,15 +57,15 @@ parse_variant(
     std::integral_constant<
         std::size_t, I> const&,
     std::true_type const&) ->
-        system::result<variant<
+        system::result<variant2::variant<
             typename R0::value_type,
             typename Rn::value_type...>>
 {
     auto const it0 = it;
     auto rv = parse(
         it, end, get<I>(rn));
     if( rv )
-        return variant<
+        return variant2::variant<
             typename R0::value_type,
             typename Rn::value_type...>{
                 variant2::in_place_index_t<I>{}, *rv};

diff --git a/test/unit/grammar/variant_rule.cpp b/test/unit/grammar/variant_rule.cpp
@@ -46,9 +46,9 @@ struct variant_rule_test
             (void)rv;
         }
 
-        ok(r, "(", variant<core::string_view, core::string_view>(
+        ok(r, "(", variant2::variant<core::string_view, core::string_view>(
             variant2::in_place_index_t<0>{}, "("));
-        ok(r, ")", variant<core::string_view, core::string_view>(
+        ok(r, ")", variant2::variant<core::string_view, core::string_view>(
             variant2::in_place_index_t<1>{}, ")"));
         bad(r, "", error::mismatch);
         bad(r, "[]", error::mismatch);