From: Paolo Carlini <pcarlini@suse.de>
Date: Sat, 27 Nov 2004 20:25:11 +0000 (+0000)
Subject: re PR libstdc++/18690 (tr1/utility is broken on darwin)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84477ec3e8983975c212ca354d1413fc791573e9;p=gcc.git

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 ce9e287e681..0dee3c5cef7 100644
--- 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 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); }
 }
 }