Merge.
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/gcc/4.4.0/350-index_macro.patch Sat Jan 02 18:01:46 2010 +0100
1.3 @@ -0,0 +1,32 @@
1.4 +Original patch from: ../4.3.2/290-index_macro.patch
1.5 +
1.6 +-= BEGIN original header =-
1.7 +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
1.8 +-= END original header =-
1.9 +
1.10 +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
1.11 +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
1.12 ++++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
1.13 +@@ -59,6 +59,9 @@
1.14 + #include <bits/gthr.h>
1.15 + #include <tr1/functional>
1.16 +
1.17 ++/* cope w/ index defined as macro, SuSv3 proposal */
1.18 ++#undef index
1.19 ++
1.20 + # ifdef __GC
1.21 + # define __GC_CONST const
1.22 + # else
1.23 +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
1.24 +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
1.25 ++++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
1.26 +@@ -54,6 +54,9 @@
1.27 + #include <ext/memory> // For uninitialized_copy_n
1.28 + #include <ext/numeric> // For power
1.29 +
1.30 ++/* cope w/ index defined as macro, SuSv3 proposal */
1.31 ++#undef index
1.32 ++
1.33 + _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
1.34 +
1.35 + using std::size_t;
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/gcc/4.4.1/350-index_macro.patch Sat Jan 02 18:01:46 2010 +0100
2.3 @@ -0,0 +1,32 @@
2.4 +Original patch from: ../4.3.2/290-index_macro.patch
2.5 +
2.6 +-= BEGIN original header =-
2.7 +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
2.8 +-= END original header =-
2.9 +
2.10 +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
2.11 +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
2.12 ++++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
2.13 +@@ -59,6 +59,9 @@
2.14 + #include <bits/gthr.h>
2.15 + #include <tr1/functional>
2.16 +
2.17 ++/* cope w/ index defined as macro, SuSv3 proposal */
2.18 ++#undef index
2.19 ++
2.20 + # ifdef __GC
2.21 + # define __GC_CONST const
2.22 + # else
2.23 +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
2.24 +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
2.25 ++++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
2.26 +@@ -54,6 +54,9 @@
2.27 + #include <ext/memory> // For uninitialized_copy_n
2.28 + #include <ext/numeric> // For power
2.29 +
2.30 ++/* cope w/ index defined as macro, SuSv3 proposal */
2.31 ++#undef index
2.32 ++
2.33 + _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
2.34 +
2.35 + using std::size_t;
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/gcc/4.4.2/350-index_macro.patch Sat Jan 02 18:01:46 2010 +0100
3.3 @@ -0,0 +1,32 @@
3.4 +Original patch from: ../4.3.2/290-index_macro.patch
3.5 +
3.6 +-= BEGIN original header =-
3.7 +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
3.8 +-= END original header =-
3.9 +
3.10 +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope
3.11 +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/rope 2008-07-15 12:14:51.000000000 +0200
3.12 ++++ gcc-4.3.3/libstdc++-v3/include/ext/rope 2009-01-27 22:25:41.000000000 +0100
3.13 +@@ -59,6 +59,9 @@
3.14 + #include <bits/gthr.h>
3.15 + #include <tr1/functional>
3.16 +
3.17 ++/* cope w/ index defined as macro, SuSv3 proposal */
3.18 ++#undef index
3.19 ++
3.20 + # ifdef __GC
3.21 + # define __GC_CONST const
3.22 + # else
3.23 +diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h
3.24 +--- gcc-4.3.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200
3.25 ++++ gcc-4.3.3/libstdc++-v3/include/ext/ropeimpl.h 2009-01-27 22:25:41.000000000 +0100
3.26 +@@ -54,6 +54,9 @@
3.27 + #include <ext/memory> // For uninitialized_copy_n
3.28 + #include <ext/numeric> // For power
3.29 +
3.30 ++/* cope w/ index defined as macro, SuSv3 proposal */
3.31 ++#undef index
3.32 ++
3.33 + _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
3.34 +
3.35 + using std::size_t;