Oops.
Paolo.
///////////////
2011-05-16 Paolo Carlini <paolo.carl...@oracle.com>
* include/std/utility: Simplify the last commit, the whole
std::get code is C++0x only.
Index: include/std/utility
===================================================================
--- include/std/utility (revision 173798)
+++ include/std/utility (working copy)
@@ -87,7 +87,7 @@
// Various functions which give std::pair a tuple-like interface.
template<class _Tp1, class _Tp2>
- struct tuple_size<std::pair<_Tp1, _Tp2> >
+ struct tuple_size<std::pair<_Tp1, _Tp2>>
{ static const std::size_t value = 2; };
template<class _Tp1, class _Tp2>
@@ -95,11 +95,11 @@
tuple_size<std::pair<_Tp1, _Tp2> >::value;
template<class _Tp1, class _Tp2>
- struct tuple_element<0, std::pair<_Tp1, _Tp2> >
+ struct tuple_element<0, std::pair<_Tp1, _Tp2>>
{ typedef _Tp1 type; };
template<class _Tp1, class _Tp2>
- struct tuple_element<1, std::pair<_Tp1, _Tp2> >
+ struct tuple_element<1, std::pair<_Tp1, _Tp2>>
{ typedef _Tp2 type; };
template<std::size_t _Int>
@@ -110,19 +110,17 @@
{
template<typename _Tp1, typename _Tp2>
static _Tp1&
- __get(std::pair<_Tp1, _Tp2>& __pair) _GLIBCXX_NOEXCEPT
+ __get(std::pair<_Tp1, _Tp2>& __pair) noexcept
{ return __pair.first; }
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
template<typename _Tp1, typename _Tp2>
static _Tp1&&
__move_get(std::pair<_Tp1, _Tp2>&& __pair) noexcept
{ return std::forward<_Tp1>(__pair.first); }
-#endif
template<typename _Tp1, typename _Tp2>
static const _Tp1&
- __const_get(const std::pair<_Tp1, _Tp2>& __pair) _GLIBCXX_NOEXCEPT
+ __const_get(const std::pair<_Tp1, _Tp2>& __pair) noexcept
{ return __pair.first; }
};
@@ -131,37 +129,33 @@
{
template<typename _Tp1, typename _Tp2>
static _Tp2&
- __get(std::pair<_Tp1, _Tp2>& __pair) _GLIBCXX_NOEXCEPT
+ __get(std::pair<_Tp1, _Tp2>& __pair) noexcept
{ return __pair.second; }
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
template<typename _Tp1, typename _Tp2>
static _Tp2&&
__move_get(std::pair<_Tp1, _Tp2>&& __pair) noexcept
{ return std::forward<_Tp2>(__pair.second); }
-#endif
template<typename _Tp1, typename _Tp2>
static const _Tp2&
- __const_get(const std::pair<_Tp1, _Tp2>& __pair) _GLIBCXX_NOEXCEPT
+ __const_get(const std::pair<_Tp1, _Tp2>& __pair) noexcept
{ return __pair.second; }
};
template<std::size_t _Int, class _Tp1, class _Tp2>
- inline typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&
- get(std::pair<_Tp1, _Tp2>& __in) _GLIBCXX_NOEXCEPT
+ inline typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&
+ get(std::pair<_Tp1, _Tp2>& __in) noexcept
{ return __pair_get<_Int>::__get(__in); }
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
template<std::size_t _Int, class _Tp1, class _Tp2>
- inline typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&&
+ inline typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&&
get(std::pair<_Tp1, _Tp2>&& __in) noexcept
{ return __pair_get<_Int>::__move_get(std::move(__in)); }
-#endif
template<std::size_t _Int, class _Tp1, class _Tp2>
- inline const typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&
- get(const std::pair<_Tp1, _Tp2>& __in) _GLIBCXX_NOEXCEPT
+ inline const typename tuple_element<_Int, std::pair<_Tp1, _Tp2>>::type&
+ get(const std::pair<_Tp1, _Tp2>& __in) noexcept
{ return __pair_get<_Int>::__const_get(__in); }
_GLIBCXX_END_NAMESPACE_VERSION
