Commit 84477ec3 by Paolo Carlini Committed by Paolo Carlini

re PR libstdc++/18690 (tr1/utility is broken on darwin)

2004-11-27  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/18690
	* include/tr1/utility (get(pair), get(const pair)): Change
	occurrences of _I to _Int.

From-SVN: r91390
parent 4961e35d
2004-11-27 Paolo Carlini <pcarlini@suse.de> 2004-11-27 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/18690
* include/tr1/utility (get(pair), get(const pair)): Change
occurrences of _I to _Int.
2004-11-27 Paolo Carlini <pcarlini@suse.de>
* testsuite/27_io/basic_istream/getline/wchar_t/2.cc: Fix typo. * testsuite/27_io/basic_istream/getline/wchar_t/2.cc: Fix typo.
* testsuite/27_io/basic_istream/getline/wchar_t/4.cc: Likewise. * testsuite/27_io/basic_istream/getline/wchar_t/4.cc: Likewise.
......
...@@ -74,15 +74,15 @@ namespace tr1 ...@@ -74,15 +74,15 @@ namespace tr1
{ return __pair.second; } { return __pair.second; }
}; };
template<int _I, class _Tp1, class _Tp2> template<int _Int, class _Tp1, class _Tp2>
typename tuple_element<_I, std::pair<_Tp1, _Tp2> >::type& typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&
get(pair<_Tp1, _Tp2>& __in) get(pair<_Tp1, _Tp2>& __in)
{ return __pair_get<_I>::__get(__in); } { return __pair_get<_Int>::__get(__in); }
template<int _I, class _Tp1, class _Tp2> template<int _Int, class _Tp1, class _Tp2>
const typename tuple_element<_I, std::pair<_Tp1, _Tp2> >::type& const typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type&
get(const pair<_Tp1, _Tp2>& __in) get(const pair<_Tp1, _Tp2>& __in)
{ return __pair_get<_I>::__const_get(__in); } { return __pair_get<_Int>::__const_get(__in); }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment