| From b037953e40312b45ab84ed0a3ad882bb5e413101 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Fri, 29 Mar 2013 08:51:02 +0400 |
| Subject: [PATCH 11/35] index_macro |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| Upstream-Status: Pending |
| --- |
| libstdc++-v3/include/ext/rope | 3 +++ |
| libstdc++-v3/include/ext/ropeimpl.h | 3 +++ |
| 2 files changed, 6 insertions(+) |
| |
| diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope |
| index 38eb1e8..158d21a 100644 |
| --- a/libstdc++-v3/include/ext/rope |
| +++ b/libstdc++-v3/include/ext/rope |
| @@ -55,6 +55,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 |
| diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h |
| index d7b5cbd..b9b3acb 100644 |
| --- a/libstdc++-v3/include/ext/ropeimpl.h |
| +++ b/libstdc++-v3/include/ext/ropeimpl.h |
| @@ -48,6 +48,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 |
| -- |
| 1.7.10.4 |
| |