diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-11-27 20:25:11 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-11-27 20:25:11 +0000 |
| commit | 84477ec3e8983975c212ca354d1413fc791573e9 (patch) | |
| tree | 41ad0824c2875b4cd7d05e7496d7cbed01182585 | |
| parent | 4961e35da5cd8f4877b8608eed0f9c7c08f2e63d (diff) | |
| download | gcc-84477ec3e8983975c212ca354d1413fc791573e9.zip gcc-84477ec3e8983975c212ca354d1413fc791573e9.tar.gz gcc-84477ec3e8983975c212ca354d1413fc791573e9.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/tr1/utility | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ce9e287..0dee3c5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 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/4.cc: Likewise. diff --git a/libstdc++-v3/include/tr1/utility b/libstdc++-v3/include/tr1/utility index 92484ea..c987d04 100644 --- a/libstdc++-v3/include/tr1/utility +++ b/libstdc++-v3/include/tr1/utility @@ -74,15 +74,15 @@ namespace tr1 { return __pair.second; } }; - template<int _I, class _Tp1, class _Tp2> - typename tuple_element<_I, std::pair<_Tp1, _Tp2> >::type& + template<int _Int, class _Tp1, class _Tp2> + typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type& get(pair<_Tp1, _Tp2>& __in) - { return __pair_get<_I>::__get(__in); } + { return __pair_get<_Int>::__get(__in); } - template<int _I, class _Tp1, class _Tp2> - const typename tuple_element<_I, std::pair<_Tp1, _Tp2> >::type& + template<int _Int, class _Tp1, class _Tp2> + const typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type& get(const pair<_Tp1, _Tp2>& __in) - { return __pair_get<_I>::__const_get(__in); } + { return __pair_get<_Int>::__const_get(__in); } } } |