| author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
| Tue Jul 12 23:52:24 2011 +0200 (2011-07-12) | |
| branch | 1.11 |
| changeset 2558 | b7317d2fe0e9 |
| parent 757 | 90e887b06da3 |
| permissions | -rw-r--r-- |
| yann@757 | 1 |
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch |
| yann@757 | 2 |
diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/rope gcc-4.3.1/libstdc++-v3/include/ext/rope |
| yann@757 | 3 |
--- gcc-4.3.1.orig/libstdc++-v3/include/ext/rope 2008-01-31 19:44:55.000000000 +0100 |
| yann@757 | 4 |
+++ gcc-4.3.1/libstdc++-v3/include/ext/rope 2008-06-10 14:59:02.000000000 +0200 |
| yann@757 | 5 |
@@ -59,6 +59,9 @@ |
| yann@757 | 6 |
#include <bits/gthr.h> |
| yann@757 | 7 |
#include <tr1/functional> |
| yann@757 | 8 |
|
| yann@757 | 9 |
+/* cope w/ index defined as macro, SuSv3 proposal */ |
| yann@757 | 10 |
+#undef index |
| yann@757 | 11 |
+ |
| yann@757 | 12 |
# ifdef __GC |
| yann@757 | 13 |
# define __GC_CONST const |
| yann@757 | 14 |
# else |
| yann@757 | 15 |
diff -durN gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h |
| yann@757 | 16 |
--- gcc-4.3.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2007-05-04 17:06:46.000000000 +0200 |
| yann@757 | 17 |
+++ gcc-4.3.1/libstdc++-v3/include/ext/ropeimpl.h 2008-06-10 14:59:02.000000000 +0200 |
| yann@757 | 18 |
@@ -54,6 +54,9 @@ |
| yann@757 | 19 |
#include <ext/memory> // For uninitialized_copy_n |
| yann@757 | 20 |
#include <ext/numeric> // For power |
| yann@757 | 21 |
|
| yann@757 | 22 |
+/* cope w/ index defined as macro, SuSv3 proposal */ |
| yann@757 | 23 |
+#undef index |
| yann@757 | 24 |
+ |
| yann@757 | 25 |
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) |
| yann@757 | 26 |
|
| yann@757 | 27 |
using std::size_t; |