git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

utility: Simplify the last commit, the whole std::get code is C++0x only. 

2011-05-16  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/utility: Simplify the last commit, the whole
	std::get code is C++0x only.

From-SVN: r173799
This commit is contained in:
Paolo Carlini 2011-05-16 18:24:01 +00:00 committed by Paolo Carlini
parent 18eeaec47b
commit 7933dc2a80
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-16 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/utility: Simplify the last commit, the whole
std::get code is C++0x only.
2011-05-16 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/utility (get(std::pair<>&&)): Add.

18
libstdc++-v3/include/std/utility
View File

@ -110,19 +110,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
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 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
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
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&&
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
get(const std::pair<_Tp1, _Tp2>& __in) noexcept
{ return __pair_get<_Int>::__const_get(__in); }
_GLIBCXX_END_NAMESPACE_VERSION