patches/gcc/4.0.4/160-index_macro.patch
| author |
"Yann E. MORIN" <yann.morin.1998@free.fr> |
|
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27) |
| changeset 3152 |
b286c7993be5 |
| parent 1 |
eeea35fbf182
|
| permissions |
-rw-r--r-- |
scripts/addToolsVersion: properly handle .in vs. .in.2
While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).
Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.
So, for each tool, we need to explicitly know what file to munge.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
yann@1
|
1 |
--- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps 2006-03-24 01:49:51 +0100
|
|
yann@1
|
2 |
+++ gcc-4.1.0/libstdc++-v3/include/ext/rope 2006-03-24 01:49:37 +0100
|
|
yann@1
|
3 |
@@ -59,6 +59,9 @@
|
|
yann@1
|
4 |
#include <bits/allocator.h>
|
|
yann@1
|
5 |
#include <ext/hash_fun.h>
|
|
yann@1
|
6 |
|
|
yann@1
|
7 |
+/* cope w/ index defined as macro, SuSv3 proposal */
|
|
yann@1
|
8 |
+#undef index
|
|
yann@1
|
9 |
+
|
|
yann@1
|
10 |
# ifdef __GC
|
|
yann@1
|
11 |
# define __GC_CONST const
|
|
yann@1
|
12 |
# else
|
|
yann@1
|
13 |
--- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps 2006-03-24 01:50:04 +0100
|
|
yann@1
|
14 |
+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h 2006-03-24 01:50:28 +0100
|
|
yann@1
|
15 |
@@ -53,6 +53,9 @@
|
|
yann@1
|
16 |
#include <ext/memory> // For uninitialized_copy_n
|
|
yann@1
|
17 |
#include <ext/numeric> // For power
|
|
yann@1
|
18 |
|
|
yann@1
|
19 |
+/* cope w/ index defined as macro, SuSv3 proposal */
|
|
yann@1
|
20 |
+#undef index
|
|
yann@1
|
21 |
+
|
|
yann@1
|
22 |
namespace __gnu_cxx
|
|
yann@1
|
23 |
{
|
|
yann@1
|
24 |
using std::size_t;
|