diff options
author | DJ Delorie <dj@redhat.com> | 2009-03-18 03:07:38 +0300 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2009-03-18 03:07:38 +0300 |
commit | cb55223679df8c9a7f5d06650455e09b8bd3e324 (patch) | |
tree | d224ef2391601825ef4ed13fa915ed77ba8054af | |
parent | d99179dbf3d1f5b3735a77970d004c4e280e691f (diff) |
merge from gcc
-rw-r--r-- | include/ChangeLog | 5 | ||||
-rw-r--r-- | include/demangle.h | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index aef73a3a1..ac8f2848a 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2009-03-17 Jason Merrill <jason@redhat.com> + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_FUNCTION_PARAM. + 2009-03-14 Dave Korn <dave.korn.cygwin@gmail.com> * coff/internal.h (struct internal_extra_pe_aouthdr): Correct type diff --git a/include/demangle.h b/include/demangle.h index 28c69f5e7..eb39c7c13 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -221,6 +221,8 @@ enum demangle_component_type /* A template parameter. This holds a number, which is the template parameter index. */ DEMANGLE_COMPONENT_TEMPLATE_PARAM, + /* A function parameter. This holds a number, which is the index. */ + DEMANGLE_COMPONENT_FUNCTION_PARAM, /* A constructor. This holds a name and the kind of constructor. */ DEMANGLE_COMPONENT_CTOR, @@ -466,10 +468,10 @@ struct demangle_component int len; } s_string; - /* For DEMANGLE_COMPONENT_TEMPLATE_PARAM. */ + /* For DEMANGLE_COMPONENT_*_PARAM. */ struct { - /* Template parameter index. */ + /* Parameter index. */ long number; } s_number; |