From edba13573919a8a8fb8410360e3a3a0c18867c0b Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 14 Dec 2021 20:20:44 +0200 Subject: [PATCH] Use unqualified get instead of std::get (refs #69) --- include/boost/mp11/tuple.hpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/include/boost/mp11/tuple.hpp b/include/boost/mp11/tuple.hpp index ae74303..044801d 100644 --- a/include/boost/mp11/tuple.hpp +++ b/include/boost/mp11/tuple.hpp @@ -31,10 +31,12 @@ namespace mp11 namespace detail { +using std::get; + template BOOST_MP11_CONSTEXPR auto tuple_apply_impl( F && f, Tp && tp, integer_sequence ) - -> decltype( std::forward(f)( std::get(std::forward(tp))... ) ) + -> decltype( std::forward(f)( get(std::forward(tp))... ) ) { - return std::forward(f)( std::get(std::forward(tp))... ); + return std::forward(f)( get(std::forward(tp))... ); } } // namespace detail @@ -53,7 +55,7 @@ namespace detail template BOOST_MP11_CONSTEXPR T construct_from_tuple_impl( Tp && tp, integer_sequence ) { - return T( std::get(std::forward(tp))... ); + return T( get(std::forward(tp))... ); } } // namespace detail @@ -72,7 +74,7 @@ namespace detail template BOOST_MP11_CONSTEXPR F tuple_for_each_impl( Tp && tp, integer_sequence, F && f ) { using A = int[sizeof...(J)]; - return (void)A{ ((void)f(std::get(std::forward(tp))), 0)... }, std::forward(f); + return (void)A{ ((void)f(get(std::forward(tp))), 0)... }, std::forward(f); } template BOOST_MP11_CONSTEXPR F tuple_for_each_impl( Tp && /*tp*/, integer_sequence, F && f ) @@ -106,9 +108,9 @@ template BOOST_MP11_CONSTEXPR auto tp_forward_v( T&&... t ) -> std:: template BOOST_MP11_CONSTEXPR auto tp_extract( Tp&&... tp ) - -> decltype( tp_forward_r( std::get( std::forward( tp ) )... ) ) + -> decltype( tp_forward_r( get( std::forward( tp ) )... ) ) { - return tp_forward_r( std::get( std::forward( tp ) )... ); + return tp_forward_r( get( std::forward( tp ) )... ); } #if !BOOST_MP11_WORKAROUND( BOOST_MP11_MSVC, < 1900 ) @@ -124,23 +126,23 @@ BOOST_MP11_CONSTEXPR auto tuple_transform_impl( integer_sequence BOOST_MP11_CONSTEXPR auto tuple_transform_impl( integer_sequence, F const& f, Tp1&& tp1 ) - -> decltype( tp_forward_v( f( std::get( std::forward(tp1) ) )... ) ) + -> decltype( tp_forward_v( f( get( std::forward(tp1) ) )... ) ) { - return tp_forward_v( f( std::get( std::forward(tp1) ) )... ); + return tp_forward_v( f( get( std::forward(tp1) ) )... ); } template BOOST_MP11_CONSTEXPR auto tuple_transform_impl( integer_sequence, F const& f, Tp1&& tp1, Tp2&& tp2 ) - -> decltype( tp_forward_v( f( std::get( std::forward(tp1) ), std::get( std::forward(tp2) ) )... ) ) + -> decltype( tp_forward_v( f( get( std::forward(tp1) ), get( std::forward(tp2) ) )... ) ) { - return tp_forward_v( f( std::get( std::forward(tp1) ), std::get( std::forward(tp2) ) )... ); + return tp_forward_v( f( get( std::forward(tp1) ), get( std::forward(tp2) ) )... ); } template BOOST_MP11_CONSTEXPR auto tuple_transform_impl( integer_sequence, F const& f, Tp1&& tp1, Tp2&& tp2, Tp3&& tp3 ) - -> decltype( tp_forward_v( f( std::get( std::forward(tp1) ), std::get( std::forward(tp2) ), std::get( std::forward(tp3) ) )... ) ) + -> decltype( tp_forward_v( f( get( std::forward(tp1) ), get( std::forward(tp2) ), get( std::forward(tp3) ) )... ) ) { - return tp_forward_v( f( std::get( std::forward(tp1) ), std::get( std::forward(tp2) ), std::get( std::forward(tp3) ) )... ); + return tp_forward_v( f( get( std::forward(tp1) ), get( std::forward(tp2) ), get( std::forward(tp3) ) )... ); } #endif // !BOOST_MP11_WORKAROUND( BOOST_MP11_MSVC, < 1900 )