* cp-demangle.c (d_make_comp): DEMANGLE_COMPONENT_CONSTRUCTION_VTABLE

	takes two parameters.
	* cp-demint.c (cplus_demangle_fill_component): Likewise.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9bc2903..cf9d8e4 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-13  Daniel Jacobowitz  <drow@mvista.com>
+
+       * 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  <ian@wasabisystems.com>
 
        * 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 1c43eb8..19f191e 100644 (file)
--- 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 833e89e..533202d 100644 (file)
--- 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: