From 7dfaa59e8253e9d49277a75611a3a6d9e5366e78 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 7 Oct 2008 01:27:53 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 5 +++++ include/demangle.h | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_PACK_EXPANSION. + 2008-09-24 Richard Henderson * 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. */