aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-03-18 00:07:49 +0000
committerDJ Delorie <dj@redhat.com>2009-03-18 00:07:49 +0000
commitc743cf5d81e46011aada39382daabf1383f3ad41 (patch)
tree404e807c19fa4d2e25153858a712397b8ba0c5c1 /include
parent5b548f9aa4f12b5b0912a5b5a9d1a30ccb2338e5 (diff)
downloadgdb-c743cf5d81e46011aada39382daabf1383f3ad41.zip
gdb-c743cf5d81e46011aada39382daabf1383f3ad41.tar.gz
gdb-c743cf5d81e46011aada39382daabf1383f3ad41.tar.bz2
merge from gcc
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/demangle.h6
2 files changed, 9 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index aef73a3..ac8f284 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 28c69f5..eb39c7c 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;