summaryrefslogtreecommitdiff
path: root/patches/gcc/4.4.4/350-index_macro.patch
blob: ff99aca212a957ca6c061a2bc2f8750106199266 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Original patch from: ../4.3.2/290-index_macro.patch

-= BEGIN original header =-
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_304-index_macro.patch
-= END original header =-

diff -durN gcc-4.3.3.orig/libstdc++-v3/include/ext/rope gcc-4.3.3/libstdc++-v3/include/ext/rope

diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/rope gcc-4.4.4/libstdc++-v3/include/ext/rope
--- gcc-4.4.4.orig/libstdc++-v3/include/ext/rope	2009-04-10 01:23:07.000000000 +0200
+++ gcc-4.4.4/libstdc++-v3/include/ext/rope	2010-05-16 19:37:47.000000000 +0200
@@ -54,6 +54,9 @@
 #include <bits/gthr.h>
 #include <tr1/functional>
 
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
 # ifdef __GC
 #   define __GC_CONST const
 # else
diff -durN gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h
--- gcc-4.4.4.orig/libstdc++-v3/include/ext/ropeimpl.h	2009-04-10 01:23:07.000000000 +0200
+++ gcc-4.4.4/libstdc++-v3/include/ext/ropeimpl.h	2010-05-16 19:37:47.000000000 +0200
@@ -49,6 +49,9 @@
 #include <ext/memory> // For uninitialized_copy_n
 #include <ext/numeric> // For power
 
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
 _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
   using std::size_t;