From 2d6520ee207ec339308f7876b2036b7dbeb5cbd1 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 13 Jan 2004 21:34:31 +0000 Subject: [PATCH] * cp-demangle.c (d_make_comp): DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE takes two parameters. * cp-demint.c (cplus_demangle_fill_component): Likewise. --- libiberty/ChangeLog | 6 ++++++ libiberty/cp-demangle.c | 2 +- libiberty/cp-demint.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 9bc2903b52..cf9d8e47e3 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2004-01-13 Daniel Jacobowitz + + * cp-demangle.c (d_make_comp): DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE + takes two parameters. + * cp-demint.c (cplus_demangle_fill_component): Likewise. + 2004-01-12 Ian Lance Taylor * cp-demangle.c: Include "cp-demangle.h". If IN_GLIBCPP_V3 is diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 1c43eb8bd4..19f191ed8b 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -751,6 +751,7 @@ d_make_comp (di, type, left, right) case DEMANGLE_COMPONENT_LOCAL_NAME: case DEMANGLE_COMPONENT_TYPED_NAME: case DEMANGLE_COMPONENT_TEMPLATE: + case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE: case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL: case DEMANGLE_COMPONENT_PTRMEM_TYPE: case DEMANGLE_COMPONENT_UNARY: @@ -768,7 +769,6 @@ d_make_comp (di, type, left, right) /* These types only require one parameter. */ case DEMANGLE_COMPONENT_VTABLE: case DEMANGLE_COMPONENT_VTT: - case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE: case DEMANGLE_COMPONENT_TYPEINFO: case DEMANGLE_COMPONENT_TYPEINFO_NAME: case DEMANGLE_COMPONENT_TYPEINFO_FN: diff --git a/libiberty/cp-demint.c b/libiberty/cp-demint.c index 833e89e7a9..533202dd10 100644 --- a/libiberty/cp-demint.c +++ b/libiberty/cp-demint.c @@ -70,6 +70,7 @@ cplus_demangle_fill_component (p, type, left, right) case DEMANGLE_COMPONENT_LOCAL_NAME: case DEMANGLE_COMPONENT_TYPED_NAME: case DEMANGLE_COMPONENT_TEMPLATE: + case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE: case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL: case DEMANGLE_COMPONENT_FUNCTION_TYPE: case DEMANGLE_COMPONENT_ARRAY_TYPE: @@ -89,7 +90,6 @@ cplus_demangle_fill_component (p, type, left, right) /* These component types only have one subtree. */ case DEMANGLE_COMPONENT_VTABLE: case DEMANGLE_COMPONENT_VTT: - case DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE: case DEMANGLE_COMPONENT_TYPEINFO: case DEMANGLE_COMPONENT_TYPEINFO_NAME: case DEMANGLE_COMPONENT_TYPEINFO_FN: -- 2.34.1