| author | "Yann E. MORIN" <yann.morin.1998@free.fr> |
| Tue Jul 31 22:27:29 2012 +0200 (2012-07-31) | |
| changeset 3018 | 7776e8369284 |
| parent 313 | 2f223aafc7cb |
| permissions | -rw-r--r-- |
| yann@313 | 1 |
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/rope gcc-4.2.1/libstdc++-v3/include/ext/rope |
| yann@313 | 2 |
--- gcc-4.2.1.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200 |
| yann@313 | 3 |
+++ gcc-4.2.1/libstdc++-v3/include/ext/rope 2007-08-03 20:34:23.000000000 +0200 |
| yann@313 | 4 |
@@ -58,6 +58,9 @@ |
| yann@313 | 5 |
#include <bits/allocator.h> |
| yann@313 | 6 |
#include <ext/hash_fun.h> |
| yann@313 | 7 |
|
| yann@313 | 8 |
+/* cope w/ index defined as macro, SuSv3 proposal */ |
| yann@313 | 9 |
+#undef index |
| yann@313 | 10 |
+ |
| yann@313 | 11 |
# ifdef __GC |
| yann@313 | 12 |
# define __GC_CONST const |
| yann@313 | 13 |
# else |
| yann@313 | 14 |
diff -durN gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h |
| yann@313 | 15 |
--- gcc-4.2.1.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200 |
| yann@313 | 16 |
+++ gcc-4.2.1/libstdc++-v3/include/ext/ropeimpl.h 2007-08-03 20:34:23.000000000 +0200 |
| yann@313 | 17 |
@@ -54,6 +54,9 @@ |
| yann@313 | 18 |
#include <ext/memory> // For uninitialized_copy_n |
| yann@313 | 19 |
#include <ext/numeric> // For power |
| yann@313 | 20 |
|
| yann@313 | 21 |
+/* cope w/ index defined as macro, SuSv3 proposal */ |
| yann@313 | 22 |
+#undef index |
| yann@313 | 23 |
+ |
| yann@313 | 24 |
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) |
| yann@313 | 25 |
|
| yann@313 | 26 |
using std::size_t; |