merge from gcc

2008-10-07 01:27:53 +00:00 · 2008-10-07 01:27:53 +00:00 · 7dfaa59e82
parent 455e95b5bd
commit 7dfaa59e82
2 changed files with 8 additions and 1 deletions
--- 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.
--- 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.  */