Skip to content

Commit

Permalink
Merge pull request #49 from Lastique/patch-1
Browse files Browse the repository at this point in the history
Add missing std namespace qualifiers
  • Loading branch information
pdimov authored Dec 18, 2024
2 parents 8333e9a + 47e5449 commit 509ce1d
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions include/boost/variant2/variant.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ template<class... T> struct variant_base_impl<true, true, T...>

template<std::size_t I> BOOST_CXX14_CONSTEXPR mp11::mp_at_c<variant<T...>, I>& _get_impl( mp11::mp_size_t<I> ) noexcept
{
size_t const J = I+1;
std::size_t const J = I+1;

BOOST_ASSERT( ix_ == J );

Expand All @@ -889,7 +889,7 @@ template<class... T> struct variant_base_impl<true, true, T...>

template<std::size_t I> constexpr mp11::mp_at_c<variant<T...>, I> const& _get_impl( mp11::mp_size_t<I> ) const noexcept
{
// size_t const J = I+1;
// std::size_t const J = I+1;

BOOST_VARIANT2_CX14_ASSERT( ix_ == I+1 )

Expand Down Expand Up @@ -958,7 +958,7 @@ template<class... T> struct variant_base_impl<true, false, T...>
{
BOOST_ASSERT( index() == I );

size_t const J = I+1;
std::size_t const J = I+1;

constexpr mp11::mp_size_t<J> j{};
return st_[ ix_ & 1 ].get( j );
Expand All @@ -968,15 +968,15 @@ template<class... T> struct variant_base_impl<true, false, T...>
{
BOOST_VARIANT2_CX14_ASSERT( index() == I )

// size_t const J = I+1;
// std::size_t const J = I+1;
// constexpr mp_size_t<J> j{};

return st_[ ix_ & 1 ].get( mp11::mp_size_t<I+1>() );
}

template<std::size_t I, class... A> BOOST_CXX14_CONSTEXPR void emplace( A&&... a )
{
size_t const J = I+1;
std::size_t const J = I+1;

unsigned i2 = 1 - ( ix_ & 1 );

Expand Down Expand Up @@ -1048,7 +1048,7 @@ template<class... T> struct variant_base_impl<false, true, T...>

template<std::size_t I> BOOST_CXX14_CONSTEXPR mp11::mp_at_c<variant<T...>, I>& _get_impl( mp11::mp_size_t<I> ) noexcept
{
size_t const J = I+1;
std::size_t const J = I+1;

BOOST_ASSERT( ix_ == J );

Expand All @@ -1057,7 +1057,7 @@ template<class... T> struct variant_base_impl<false, true, T...>

template<std::size_t I> constexpr mp11::mp_at_c<variant<T...>, I> const& _get_impl( mp11::mp_size_t<I> ) const noexcept
{
// size_t const J = I+1;
// std::size_t const J = I+1;

BOOST_VARIANT2_CX14_ASSERT( ix_ == I+1 )

Expand All @@ -1066,7 +1066,7 @@ template<class... T> struct variant_base_impl<false, true, T...>

template<std::size_t I, class... A> void emplace( A&&... a )
{
size_t const J = I+1;
std::size_t const J = I+1;

using U = mp11::mp_at_c<variant<T...>, I>;

Expand Down Expand Up @@ -1182,7 +1182,7 @@ template<class... T> struct variant_base_impl<false, false, T...>
{
BOOST_ASSERT( index() == I );

size_t const J = I+1;
std::size_t const J = I+1;

constexpr mp11::mp_size_t<J> j{};
return storage( ix_ & 1 ).get( j );
Expand All @@ -1192,15 +1192,15 @@ template<class... T> struct variant_base_impl<false, false, T...>
{
BOOST_VARIANT2_CX14_ASSERT( index() == I )

// size_t const J = I+1;
// std::size_t const J = I+1;
// constexpr mp_size_t<J> j{};

return storage( ix_ & 1 ).get( mp11::mp_size_t<I+1>() );
}

template<std::size_t I, class... A> void emplace( A&&... a )
{
size_t const J = I+1;
std::size_t const J = I+1;

unsigned i2 = 1 - ( ix_ & 1 );

Expand Down

0 comments on commit 509ce1d

Please sign in to comment.