diff options
Diffstat (limited to '3rdParty/Boost/src/boost/tuple/tuple.hpp')
-rw-r--r-- | 3rdParty/Boost/src/boost/tuple/tuple.hpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/3rdParty/Boost/src/boost/tuple/tuple.hpp b/3rdParty/Boost/src/boost/tuple/tuple.hpp index 7703597..433d4b3 100644 --- a/3rdParty/Boost/src/boost/tuple/tuple.hpp +++ b/3rdParty/Boost/src/boost/tuple/tuple.hpp @@ -23,16 +23,10 @@ namespace boost { namespace python { class tuple; }} #include "boost/config.hpp" #include "boost/static_assert.hpp" -#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -// The MSVC version -#include "boost/tuple/detail/tuple_basic_no_partial_spec.hpp" - -#else // other compilers #include "boost/ref.hpp" #include "boost/tuple/detail/tuple_basic.hpp" -#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION namespace boost { @@ -41,7 +35,7 @@ using tuples::make_tuple; using tuples::tie; #if !defined(BOOST_NO_USING_TEMPLATE) using tuples::get; -#elif !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) +#else // // The "using tuples::get" statement causes the // Borland compiler to ICE, use forwarding @@ -64,24 +58,7 @@ inline typename tuples::access_traits< get(const tuples::cons<HT, TT>& c) { return tuples::get<N,HT,TT>(c); } -#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -// -// MSVC, using declarations don't mix with templates well, -// so use forwarding functions instead: -// -template<int N, typename Head, typename Tail> -typename tuples::detail::element_ref<N, tuples::cons<Head, Tail> >::RET -get(tuples::cons<Head, Tail>& t, tuples::detail::workaround_holder<N>* = 0) -{ - return tuples::detail::get_class<N>::get(t); -} -template<int N, typename Head, typename Tail> -typename tuples::detail::element_const_ref<N, tuples::cons<Head, Tail> >::RET -get(const tuples::cons<Head, Tail>& t, tuples::detail::workaround_holder<N>* = 0) -{ - return tuples::detail::get_class<N>::get(t); -} #endif // BOOST_NO_USING_TEMPLATE } // end namespace boost |