diff options
| author | DJ Delorie <dj@redhat.com> | 2008-10-07 01:27:53 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2008-10-07 01:27:53 +0000 |
| commit | 7dfaa59e8253e9d49277a75611a3a6d9e5366e78 (patch) | |
| tree | d7e36dc2dd39e0108f5a93160577ec9d671aa5ff | |
| parent | 455e95b5bd49286496ddf1957ffabb0240c5ce47 (diff) | |
| download | cygnal-7dfaa59e8253e9d49277a75611a3a6d9e5366e78.tar.gz cygnal-7dfaa59e8253e9d49277a75611a3a6d9e5366e78.tar.bz2 cygnal-7dfaa59e8253e9d49277a75611a3a6d9e5366e78.zip | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/demangle.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index e8d9a028c..671bee394 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2008-10-06 Jason Merrill <jason@redhat.com> + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_PACK_EXPANSION. + 2008-09-24 Richard Henderson <rth@redhat.com> * elf/dwarf2.h (DW_OP_GNU_encoded_addr): New. diff --git a/include/demangle.h b/include/demangle.h index 146d778e0..0ea639d62 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -372,7 +372,9 @@ enum demangle_component_type /* A name formed by a single character. */ DEMANGLE_COMPONENT_CHARACTER, /* A decltype type. */ - DEMANGLE_COMPONENT_DECLTYPE + DEMANGLE_COMPONENT_DECLTYPE, + /* A pack expansion. */ + DEMANGLE_COMPONENT_PACK_EXPANSION }; /* Types which are only used internally. */ |