| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From b037953e40312b45ab84ed0a3ad882bb5e413101 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 08:51:02 +0400 |
| 4 | Subject: [PATCH 11/35] index_macro |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | --- |
| 10 | libstdc++-v3/include/ext/rope | 3 +++ |
| 11 | libstdc++-v3/include/ext/ropeimpl.h | 3 +++ |
| 12 | 2 files changed, 6 insertions(+) |
| 13 | |
| 14 | diff --git a/libstdc++-v3/include/ext/rope b/libstdc++-v3/include/ext/rope |
| 15 | index 38eb1e8..158d21a 100644 |
| 16 | --- a/libstdc++-v3/include/ext/rope |
| 17 | +++ b/libstdc++-v3/include/ext/rope |
| 18 | @@ -55,6 +55,9 @@ |
| 19 | #include <bits/gthr.h> |
| 20 | #include <tr1/functional> |
| 21 | |
| 22 | +/* cope w/ index defined as macro, SuSv3 proposal */ |
| 23 | +#undef index |
| 24 | + |
| 25 | # ifdef __GC |
| 26 | # define __GC_CONST const |
| 27 | # else |
| 28 | diff --git a/libstdc++-v3/include/ext/ropeimpl.h b/libstdc++-v3/include/ext/ropeimpl.h |
| 29 | index d7b5cbd..b9b3acb 100644 |
| 30 | --- a/libstdc++-v3/include/ext/ropeimpl.h |
| 31 | +++ b/libstdc++-v3/include/ext/ropeimpl.h |
| 32 | @@ -48,6 +48,9 @@ |
| 33 | #include <ext/memory> // For uninitialized_copy_n |
| 34 | #include <ext/numeric> // For power |
| 35 | |
| 36 | +/* cope w/ index defined as macro, SuSv3 proposal */ |
| 37 | +#undef index |
| 38 | + |
| 39 | namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) |
| 40 | { |
| 41 | _GLIBCXX_BEGIN_NAMESPACE_VERSION |
| 42 | -- |
| 43 | 1.7.10.4 |
| 44 | |