Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/tuple/detail/tuple_basic.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/tuple/detail/tuple_basic.hpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/tuple/detail/tuple_basic.hpp b/3rdParty/Boost/src/boost/tuple/detail/tuple_basic.hpp index 88f0d90..5f26c7f 100644 --- a/3rdParty/Boost/src/boost/tuple/detail/tuple_basic.hpp +++ b/3rdParty/Boost/src/boost/tuple/detail/tuple_basic.hpp @@ -41,6 +41,11 @@ #include "boost/detail/workaround.hpp" // needed for BOOST_WORKAROUND +#if BOOST_GCC >= 40700 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-local-typedefs" +#endif + namespace boost { namespace tuples { @@ -208,7 +213,7 @@ template<int N, class HT, class TT> inline typename access_traits< typename element<N, cons<HT, TT> >::type >::non_const_type -get(cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { +get(cons<HT, TT>& c) { typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE apply<cons<HT, TT> > impl; typedef BOOST_DEDUCED_TYPENAME impl::type cons_element; @@ -222,10 +227,9 @@ template<int N, class HT, class TT> inline typename access_traits< typename element<N, cons<HT, TT> >::type >::const_type -get(const cons<HT, TT>& c BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { +get(const cons<HT, TT>& c) { typedef BOOST_DEDUCED_TYPENAME detail::drop_front<N>::BOOST_NESTED_TEMPLATE apply<cons<HT, TT> > impl; - typedef BOOST_DEDUCED_TYPENAME impl::type cons_element; return impl::call(c).head; } @@ -399,7 +403,7 @@ struct cons<HT, null_type> { typename access_traits< typename element<N, self_type>::type >::non_const_type - get(BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) { + get() { return boost::tuples::get<N>(*this); } @@ -407,7 +411,7 @@ struct cons<HT, null_type> { typename access_traits< typename element<N, self_type>::type >::const_type - get(BOOST_EXPLICIT_TEMPLATE_NON_TYPE(int, N)) const { + get() const { return boost::tuples::get<N>(*this); } @@ -975,6 +979,11 @@ inline void swap(tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>& lhs, } // end of namespace boost +#if BOOST_GCC >= 40700 +#pragma GCC diagnostic pop +#endif + + #endif // BOOST_TUPLE_BASIC_HPP |