diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-27 20:25:11 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-27 20:25:11 +0000 |
| commit | a8fe29f99596595c0c055cb4e53e132e528eebf6 (patch) | |
| tree | 41ad0824c2875b4cd7d05e7496d7cbed01182585 /libstdc++-v3 | |
| parent | 9126475969e057c64318250b43691f54292fd647 (diff) | |
| download | gcc-a8fe29f99596595c0c055cb4e53e132e528eebf6.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91390 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -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 ce9e287e681..0dee3c5cef7 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 92484ea8cc5..c987d045934 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); } } } |