31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
Upstream-Status: Pending
|
|
|
|
Index: gcc-4.5.0/libstdc++-v3/include/ext/rope
|
|
===================================================================
|
|
--- gcc-4.5.0.orig/libstdc++-v3/include/ext/rope 2009-04-09 08:00:19.000000000 -0700
|
|
+++ gcc-4.5.0/libstdc++-v3/include/ext/rope 2010-06-25 10:51:33.613383077 -0700
|
|
@@ -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.5.0/libstdc++-v3/include/ext/ropeimpl.h
|
|
===================================================================
|
|
--- gcc-4.5.0.orig/libstdc++-v3/include/ext/ropeimpl.h 2009-04-09 08:00:19.000000000 -0700
|
|
+++ gcc-4.5.0/libstdc++-v3/include/ext/ropeimpl.h 2010-06-25 10:51:33.621381669 -0700
|
|
@@ -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;
|