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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ce9e287e68192b5d12f4c3de61d7f6364e168d1a..0dee3c5cef7eb126245e057cedf9febac5c8e6ec 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/libstdc++-v3/include/tr1/utility b/libstdc++-v3/include/tr1/utility
index 92484ea8cc5a112fb3c88144b587bbbc6b713337..c987d0459346b968d244bb77f1695f47de18d578 100644 (file)
--- 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); }
 }
 }