| author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
| Mon Mar 14 22:16:01 2011 +0100 (2011-03-14) | |
| changeset 2335 | 805e9f2a06fa |
| parent 1948 | d341be24dc68 |
| permissions | -rw-r--r-- |
| yann@1948 | 1 |
-= BEGIN original header =- |
| yann@1948 | 2 |
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch |
| yann@1948 | 3 |
-= END original header =- |
| yann@1948 | 4 |
|
| yann@1948 | 5 |
diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/rope gcc-4.4.4/libstdc++-v3/include/ext/rope |
| yann@1948 | 6 |
--- gcc-4.4.4.orig/libstdc++-v3/include/ext/rope 2009-04-10 01:23:07.000000000 +0200 |
| yann@1948 | 7 |
+++ gcc-4.4.4/libstdc++-v3/include/ext/rope 2010-05-16 19:37:47.000000000 +0200 |
| yann@1948 | 8 |
@@ -54,6 +54,9 @@ |
| yann@1948 | 9 |
#include <bits/gthr.h> |
| yann@1948 | 10 |
#include <tr1/functional> |
| yann@1948 | 11 |
|
| yann@1948 | 12 |
+/* cope w/ index defined as macro, SuSv3 proposal */ |
| yann@1948 | 13 |
+#undef index |
| yann@1948 | 14 |
+ |
| yann@1948 | 15 |
# ifdef __GC |
| yann@1948 | 16 |
# define __GC_CONST const |
| yann@1948 | 17 |
# else |
| yann@1948 | 18 |
diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h |
| yann@1948 | 19 |
--- gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h 2009-04-10 01:23:07.000000000 +0200 |
| yann@1948 | 20 |
+++ gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h 2010-05-16 19:37:47.000000000 +0200 |
| yann@1948 | 21 |
@@ -49,6 +49,9 @@ |
| yann@1948 | 22 |
#include <ext/memory> // For uninitialized_copy_n |
| yann@1948 | 23 |
#include <ext/numeric> // For power |
| yann@1948 | 24 |
|
| yann@1948 | 25 |
+/* cope w/ index defined as macro, SuSv3 proposal */ |
| yann@1948 | 26 |
+#undef index |
| yann@1948 | 27 |
+ |
| yann@1948 | 28 |
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) |
| yann@1948 | 29 |
|
| yann@1948 | 30 |
using std::size_t; |