31 lines
917 B
Diff
31 lines
917 B
Diff
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
|