Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/3.4.6/304-index_macro.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Feb 17 22:12:59 2008 +0000 (2008-02-17)
changeset 433 9886aa0a9694
permissions -rw-r--r--
Robert P. J. DAY says:

According to Mike Frysinger, this patch was removed from Gentoo in the
2.3.x series and didn't seem to cause any adverse effects. So toss it
from the patch directories for glibc 2.5 and up.
yann@339 
     1
 
diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/rope gcc-3.4.6/libstdc++-v3/include/ext/rope
yann@339 
     2
 
--- gcc-3.4.6.orig/libstdc++-v3/include/ext/rope	2005-01-16 23:08:43.000000000 +0100
yann@339 
     3
 
+++ gcc-3.4.6/libstdc++-v3/include/ext/rope	2007-08-15 22:53:37.000000000 +0200
yann@339 
     4
 
@@ -58,6 +58,9 @@
yann@339 
     5
 
 #include <bits/allocator.h>
yann@339 
     6
 
 #include <ext/hash_fun.h>
yann@339 
     7
yann@339 
     8
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@339 
     9
 
+#undef index
yann@339 
    10
 
+
yann@339 
    11
 
 # ifdef __GC
yann@339 
    12
 
 #   define __GC_CONST const
yann@339 
    13
 
 # else
yann@339 
    14
 
diff -durN gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h
yann@339 
    15
 
--- gcc-3.4.6.orig/libstdc++-v3/include/ext/ropeimpl.h	2004-09-08 15:36:04.000000000 +0200
yann@339 
    16
 
+++ gcc-3.4.6/libstdc++-v3/include/ext/ropeimpl.h	2007-08-15 22:53:37.000000000 +0200
yann@339 
    17
 
@@ -53,6 +53,9 @@
yann@339 
    18
 
 #include <ext/memory> // For uninitialized_copy_n
yann@339 
    19
 
 #include <ext/numeric> // For power
yann@339 
    20
yann@339 
    21
 
+/* cope w/ index defined as macro, SuSv3 proposal */
yann@339 
    22
 
+#undef index
yann@339 
    23
 
+
yann@339 
    24
 
 namespace __gnu_cxx
yann@339 
    25
 
 {
yann@339 
    26
 
   using std::size_t;
crosstool-ng