summaryrefslogtreecommitdiff
path: root/meta-linaro-toolchain/recipes-devtools/gcc/gcc-4.7/304-index_macro.patch
blob: f1037652336deb5165a7bd4cc9efb64dc9aff71d (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
Upstream-Status: Pending

Index: gcc-4.6.0/libstdc++-v3/include/ext/rope
===================================================================
--- gcc-4.6.0.orig/libstdc++-v3/include/ext/rope
+++ gcc-4.6.0/libstdc++-v3/include/ext/rope
@@ -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
Index: gcc-4.6.0/libstdc++-v3/include/ext/ropeimpl.h
===================================================================
--- gcc-4.6.0.orig/libstdc++-v3/include/ext/ropeimpl.h
+++ gcc-4.6.0/libstdc++-v3/include/ext/ropeimpl.h
@@ -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
+
 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION