re PR libstdc++/18159 (tr1/tuple is broken on darwin)

2004-11-01  Chris Jefferson  <chris@bubblescope.net>

        PR libstdc++/18159
        * include/tr1/tuple (get(pair)): Change occurrences of _I to _Int.
        (get(const pair)): Likewise.

From-SVN: r89944

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ec19144b9650a5020f8c0f5463a98cf559533bd9..a2af5a8b1ff1595261b15a8b362304125fa36108 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-01  Chris Jefferson  <chris@bubblescope.net>
+
+        PR libstdc++/18159
+        * include/tr1/tuple (get(pair)): Change occurrences of _I to _Int.
+        (get(const pair)): Likewise.
+
 2004-11-01  Paolo Carlini  <pcarlini@suse.de>
 
        * include/bits/locale_facets.tcc (num_get<>::_M_extract_float):

diff --git a/libstdc++-v3/include/tr1/tuple b/libstdc++-v3/include/tr1/tuple
index 272edc3cb9191f2d7ac0fd7144416e40cf3106ed..a5fe43a2fcc529e7bec7b46c80fee8b21fe6748e 100644 (file)
--- a/libstdc++-v3/include/tr1/tuple
+++ b/libstdc++-v3/include/tr1/tuple
@@ -1545,15 +1545,15 @@ namespace tr1
     struct tuple_element<1, std::pair<_Tp1, _Tp2> >
     { typedef _Tp2 type; };
 
-  template<int _I, class _Tp1, class _Tp2>
-    typename tuple_element<_I, tuple<_Tp1, _Tp2> >::type
+  template<int _Int, class _Tp1, class _Tp2>
+    typename tuple_element<_Int, tuple<_Tp1, _Tp2> >::type
     get(pair<_Tp1, _Tp2>& __in)
-    { return get<_I>(tie(__in.first, __in.second)); }
+    { return get<_Int>(tie(__in.first, __in.second)); }
 
-  template<int _I, class _Tp1, class _Tp2>
-    typename tuple_element<_I, tuple<_Tp1, _Tp2> >::type
+  template<int _Int, class _Tp1, class _Tp2>
+    typename tuple_element<_Int, tuple<_Tp1, _Tp2> >::type
     get(const pair<_Tp1, _Tp2>& __in)
-    { return get<_I>(tie(__in.first, __in.second)); }
+    { return get<_Int>(tie(__in.first, __in.second)); }
 
 }
 }