mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 00:11:13 +00:00
29 lines
1014 B
Diff
29 lines
1014 B
Diff
|
Index: gcc-4.2.3/libstdc++-v3/include/ext/rope
|
||
|
|
===================================================================
|
||
|
|
--- gcc-4.2.3.orig/libstdc++-v3/include/ext/rope 2006-10-17 13:56:21.000000000 +0200
|
||
|
|
+++ gcc-4.2.3/libstdc++-v3/include/ext/rope 2008-05-21 13:45:50.017288293 +0200
|
||
|
|
@@ -58,6 +58,9 @@
|
||
|
|
#include <bits/allocator.h>
|
||
|
|
#include <ext/hash_fun.h>
|
||
|
|
|
||
|
|
+/* cope w/ index defined as macro, SuSv3 proposal */
|
||
|
|
+#undef index
|
||
|
|
+
|
||
|
|
# ifdef __GC
|
||
|
|
# define __GC_CONST const
|
||
|
|
# else
|
||
|
|
Index: gcc-4.2.3/libstdc++-v3/include/ext/ropeimpl.h
|
||
|
|
===================================================================
|
||
|
|
--- gcc-4.2.3.orig/libstdc++-v3/include/ext/ropeimpl.h 2006-10-17 13:56:21.000000000 +0200
|
||
|
|
+++ gcc-4.2.3/libstdc++-v3/include/ext/ropeimpl.h 2008-05-21 13:45:50.017288293 +0200
|
||
|
|
@@ -54,6 +54,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;
|