Skip to content

Replace operator& with std::addressof in get_if() #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Replace operator& with std::addressof in get_if() #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/boost/variant2/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,13 +416,13 @@ template<class U, class... T> constexpr U const&& get(variant<T...> const&& v)
template<std::size_t I, class... T> constexpr typename std::add_pointer<variant_alternative_t<I, variant<T...>>>::type get_if(variant<T...>* v) noexcept
{
static_assert( I < sizeof...(T), "Index out of bounds" );
return v && v->index() == I? &v->_get_impl( mp11::mp_size_t<I>() ): 0;
return v && v->index() == I? ::std::addressof(v->_get_impl( mp11::mp_size_t<I>() )): 0;
}

template<std::size_t I, class... T> constexpr typename std::add_pointer<const variant_alternative_t<I, variant<T...>>>::type get_if(variant<T...> const * v) noexcept
{
static_assert( I < sizeof...(T), "Index out of bounds" );
return v && v->index() == I? &v->_get_impl( mp11::mp_size_t<I>() ): 0;
return v && v->index() == I? ::std::addressof(v->_get_impl( mp11::mp_size_t<I>() )): 0;
}

template<class U, class... T> constexpr typename std::add_pointer<U>::type get_if(variant<T...>* v) noexcept
Expand All @@ -431,7 +431,7 @@ template<class U, class... T> constexpr typename std::add_pointer<U>::type get_i

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

return v && v->index() == I::value? &v->_get_impl( I() ): 0;
return v && v->index() == I::value? ::std::addressof(v->_get_impl( I() )): 0;
}

template<class U, class... T> constexpr typename std::add_pointer<U const>::type get_if(variant<T...> const * v) noexcept
Expand All @@ -440,7 +440,7 @@ template<class U, class... T> constexpr typename std::add_pointer<U const>::type

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

return v && v->index() == I::value? &v->_get_impl( I() ): 0;
return v && v->index() == I::value? ::std::addressof(v->_get_impl( I() )): 0;
}

//
Expand Down