Output: Drop unused index previously consumed by CvQualifiedType elements

Refactoring in the parent commit removed the need to consume a node
index when creating a CvQualifiedType element.  That commit preserved
the behavior artificially in order to minimize differences in expected
test output.  Now remove this behavior and update the expected test
output to account for the now-contiguous indexes.

16 files changed, 97 insertions, 99 deletions

diff --git a/src/Output.cxx b/src/Output.cxx
index 431f57e..424d523 100644
--- a/src/Output.cxx
+++ b/src/Output.cxx
@@ -648,8 +648,6 @@ ASTVisitor::DumpId ASTVisitor::AddTypeDumpNode(DumpType dt, bool complete,
 ASTVisitor::DumpId ASTVisitor::AddQualDumpNode(DumpId id) {
   DumpNode* dn = this->GetDumpNode(id);
   if (!dn->Index) {
-    // Consume a node index for temporary compatibility.
-    ++this->NodeCount;
     dn->Index = id;
     // Always treat CvQualifiedType nodes as complete.
     dn->Complete = true;
diff --git a/test/expect/gccxml.any.Class-base-typedef.xml.txt b/test/expect/gccxml.any.Class-base-typedef.xml.txt
index 44f11d9..1c143ad 100644
--- a/test/expect/gccxml.any.Class-base-typedef.xml.txt
+++ b/test/expect/gccxml.any.Class-base-typedef.xml.txt
@@ -17,15 +17,15 @@
   <ReferenceType id="_9" type="_1"/>
   <Constructor id="_10" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_11" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
-    <Argument type="_15" location="f1:1" file="f1" line="1"/>
+    <Argument type="_14" location="f1:1" file="f1" line="1"/>
   </Constructor>
-  <OperatorMethod id="_12" name="=" returns="_16" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
-    <Argument type="_15" location="f1:1" file="f1" line="1"/>
+  <OperatorMethod id="_12" name="=" returns="_15" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
+    <Argument type="_14" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
   <Destructor id="_13" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
-  <ReferenceType id="_15" type="_7c"/>
+  <ReferenceType id="_14" type="_7c"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
-  <ReferenceType id="_16" type="_7"/>
+  <ReferenceType id="_15" type="_7"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-base-typedef.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-friends.xml.txt b/test/expect/gccxml.any.Class-friends.xml.txt
index 8143e8f..ace95cd 100644
--- a/test/expect/gccxml.any.Class-friends.xml.txt
+++ b/test/expect/gccxml.any.Class-friends.xml.txt
@@ -13,8 +13,8 @@
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <ReferenceType id="_10" type="_1"/>
   <Namespace id="_2" name="::"/>
-  <Function id="_7" name="f" returns="_12" context="_2" location="f1:2" file="f1" line="2"/>
+  <Function id="_7" name="f" returns="_11" context="_2" location="f1:2" file="f1" line="2"/>
   <Class id="_8" name="A" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/>
-  <FundamentalType id="_12" name="void" size="[0-9]+" align="[0-9]+"/>
+  <FundamentalType id="_11" name="void" size="[0-9]+" align="[0-9]+"/>
   <File id="f1" name=".*/test/input/Class-friends.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt b/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt
index 2bf091b..1fd1e1a 100644
--- a/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt
@@ -11,15 +11,15 @@
   <Class id="_6" name="base&lt;const int&gt;" context="_2" location="f1:1" file="f1" line="1" members="_8 _9 _10 _11" size="[0-9]+" align="[0-9]+"/>
   <ReferenceType id="_7" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
-  <Field id="_8" name="data" type="_13c" context="_6" access="protected" location="f1:3" file="f1" line="3" offset="0"/>
+  <Field id="_8" name="data" type="_12c" context="_6" access="protected" location="f1:3" file="f1" line="3" offset="0"/>
   <Constructor id="_9" name="base" context="_6" access="protected" location="f1:4" file="f1" line="4"/>
   <Constructor id="_10" name="base" context="_6" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
-    <Argument type="_15" location="f1:1" file="f1" line="1"/>
+    <Argument type="_13" location="f1:1" file="f1" line="1"/>
   </Constructor>
   <Destructor id="_11" name="base" context="_6" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
-  <FundamentalType id="_13" name="int" size="[0-9]+" align="[0-9]+"/>
-  <CvQualifiedType id="_13c" type="_13" const="1"/>
-  <ReferenceType id="_15" type="_6c"/>
+  <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/>
+  <CvQualifiedType id="_12c" type="_12" const="1"/>
+  <ReferenceType id="_13" type="_6c"/>
   <CvQualifiedType id="_6c" type="_6" const="1"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-implicit-member-bad-base.cxx"/>
diff --git a/test/expect/gccxml.any.Class-implicit-member-const.xml.txt b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
index 99d41d8..e1812af 100644
--- a/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
@@ -4,12 +4,12 @@
   <Field id="_3" name="data" type="_7c" context="_1" access="private" location="f1:2" file="f1" line="2" offset="0"/>
   <Constructor id="_4" name="start" context="_1" access="public" location="f1:4" file="f1" line="4"/>
   <Constructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
-    <Argument type="_9" location="f1:1" file="f1" line="1"/>
+    <Argument type="_8" location="f1:1" file="f1" line="1"/>
   </Constructor>
   <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
-  <ReferenceType id="_9" type="_1c"/>
+  <ReferenceType id="_8" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-implicit-member-const.cxx"/>
diff --git a/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt b/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt
index 5bf29e2..cbb3c76 100644
--- a/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt
+++ b/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt
@@ -4,17 +4,17 @@
   <Method id="_3" name="method" returns="_8c" context="_1" access="private" location="f1:2" file="f1" line="2"/>
   <Constructor id="_4" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"/>
   <Constructor id="_5" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"( throws="")?>
-    <Argument type="_10" location="f1:4" file="f1" line="4"/>
+    <Argument type="_9" location="f1:4" file="f1" line="4"/>
   </Constructor>
-  <OperatorMethod id="_6" name="=" returns="_11" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"( throws="")?>
-    <Argument type="_10" location="f1:4" file="f1" line="4"/>
+  <OperatorMethod id="_6" name="=" returns="_10" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"( throws="")?>
+    <Argument type="_9" location="f1:4" file="f1" line="4"/>
   </OperatorMethod>
   <Destructor id="_7" name="start" context="_1" access="public" location="f1:4" file="f1" line="4" inline="1" artificial="1"( throws="")?/>
   <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_8c" type="_8" const="1"/>
-  <ReferenceType id="_10" type="_1c"/>
+  <ReferenceType id="_9" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
-  <ReferenceType id="_11" type="_1"/>
+  <ReferenceType id="_10" type="_1"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-template-Method-return-const.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template-friends.xml.txt b/test/expect/gccxml.any.Class-template-friends.xml.txt
index 061a913..837a162 100644
--- a/test/expect/gccxml.any.Class-template-friends.xml.txt
+++ b/test/expect/gccxml.any.Class-template-friends.xml.txt
@@ -13,10 +13,10 @@
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <ReferenceType id="_10" type="_1"/>
   <Namespace id="_2" name="::"/>
-  <Function id="_7" name="f" returns="_12" context="_2" location="f1:5" file="f1" line="5">
-    <Argument type="_12" location="f1:2" file="f1" line="2"/>
+  <Function id="_7" name="f" returns="_11" context="_2" location="f1:5" file="f1" line="5">
+    <Argument type="_11" location="f1:2" file="f1" line="2"/>
   </Function>
   <Class id="_8" name="A&lt;int&gt;" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/>
-  <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/>
+  <FundamentalType id="_11" name="int" size="[0-9]+" align="[0-9]+"/>
   <File id="f1" name=".*/test/input/Class-template-friends.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt b/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt
index 3348184..e6e4c73 100644
--- a/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt
+++ b/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt
@@ -7,17 +7,17 @@
   </Method>
   <Constructor id="_5" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_6" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throws="")?>
-    <Argument type="_11" location="f1:6" file="f1" line="6"/>
+    <Argument type="_10" location="f1:6" file="f1" line="6"/>
   </Constructor>
-  <OperatorMethod id="_7" name="=" returns="_12" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throws="")?>
-    <Argument type="_11" location="f1:6" file="f1" line="6"/>
+  <OperatorMethod id="_7" name="=" returns="_11" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throws="")?>
+    <Argument type="_10" location="f1:6" file="f1" line="6"/>
   </OperatorMethod>
   <Destructor id="_8" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throws="")?/>
   <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_9c" type="_9" const="1"/>
-  <ReferenceType id="_11" type="_1c"/>
+  <ReferenceType id="_10" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
-  <ReferenceType id="_12" type="_1"/>
+  <ReferenceType id="_11" type="_1"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-template-member-Typedef-const.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.CvQualifiedType.xml.txt b/test/expect/gccxml.any.CvQualifiedType.xml.txt
index a360ee6..7784333 100644
--- a/test/expect/gccxml.any.CvQualifiedType.xml.txt
+++ b/test/expect/gccxml.any.CvQualifiedType.xml.txt
@@ -1,8 +1,8 @@
 ^<\?xml version="1.0"\?>
 <GCC_XML[^>]*>
-  <Typedef id="_1" name="start" type="_2c" context="_4" location="f1:1" file="f1" line="1"/>
+  <Typedef id="_1" name="start" type="_2c" context="_3" location="f1:1" file="f1" line="1"/>
   <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_2c" type="_2" const="1"/>
-  <Namespace id="_4" name="::"/>
+  <Namespace id="_3" name="::"/>
   <File id="f1" name=".*/test/input/CvQualifiedType.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.MethodType-cv.xml.txt b/test/expect/gccxml.any.MethodType-cv.xml.txt
index a2f11bd..fb93707 100644
--- a/test/expect/gccxml.any.MethodType-cv.xml.txt
+++ b/test/expect/gccxml.any.MethodType-cv.xml.txt
@@ -1,13 +1,13 @@
 ^<\?xml version="1.0"\?>
 <GCC_XML[^>]*>
-  <Typedef id="_1" name="start" type="_2cv" context="_4" location="f1:2" file="f1" line="2"/>
-  <PointerType id="_2" type="_5"/>
+  <Typedef id="_1" name="start" type="_2cv" context="_3" location="f1:2" file="f1" line="2"/>
+  <PointerType id="_2" type="_4"/>
   <CvQualifiedType id="_2cv" type="_2" const="1" volatile="1"/>
-  <Namespace id="_4" name="::"/>
-  <MethodType id="_5" basetype="_6" returns="_7" const="1" volatile="1">
-    <Argument type="_7"/>
+  <Namespace id="_3" name="::"/>
+  <MethodType id="_4" basetype="_5" returns="_6" const="1" volatile="1">
+    <Argument type="_6"/>
   </MethodType>
-  <Class id="_6" name="A" context="_4" location="f1:1" file="f1" line="1" incomplete="1"/>
-  <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/>
+  <Class id="_5" name="A" context="_3" location="f1:1" file="f1" line="1" incomplete="1"/>
+  <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/>
   <File id="f1" name=".*/test/input/MethodType-cv.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.OffsetType-cv.xml.txt b/test/expect/gccxml.any.OffsetType-cv.xml.txt
index 16e70a5..9f4b86f 100644
--- a/test/expect/gccxml.any.OffsetType-cv.xml.txt
+++ b/test/expect/gccxml.any.OffsetType-cv.xml.txt
@@ -1,11 +1,11 @@
 ^<\?xml version="1.0"\?>
 <GCC_XML[^>]*>
-  <Typedef id="_1" name="start" type="_2cv" context="_4" location="f1:2" file="f1" line="2"/>
-  <OffsetType id="_2" basetype="_5" type="_6cv"/>
+  <Typedef id="_1" name="start" type="_2cv" context="_3" location="f1:2" file="f1" line="2"/>
+  <OffsetType id="_2" basetype="_4" type="_5cv"/>
   <CvQualifiedType id="_2cv" type="_2" const="1" volatile="1"/>
-  <Class id="_5" name="A" context="_4" location="f1:1" file="f1" line="1" incomplete="1"/>
-  <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/>
-  <CvQualifiedType id="_6cv" type="_6" const="1" volatile="1"/>
-  <Namespace id="_4" name="::"/>
+  <Class id="_4" name="A" context="_3" location="f1:1" file="f1" line="1" incomplete="1"/>
+  <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/>
+  <CvQualifiedType id="_5cv" type="_5" const="1" volatile="1"/>
+  <Namespace id="_3" name="::"/>
   <File id="f1" name=".*/test/input/OffsetType-cv.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.using-declaration-class.xml.txt b/test/expect/gccxml.any.using-declaration-class.xml.txt
index 9669b01..1ade161 100644
--- a/test/expect/gccxml.any.using-declaration-class.xml.txt
+++ b/test/expect/gccxml.any.using-declaration-class.xml.txt
@@ -25,15 +25,15 @@
   <ReferenceType id="_13" type="_1"/>
   <Constructor id="_14" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_15" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
-    <Argument type="_19" location="f1:1" file="f1" line="1"/>
+    <Argument type="_18" location="f1:1" file="f1" line="1"/>
   </Constructor>
-  <OperatorMethod id="_16" name="=" returns="_20" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
-    <Argument type="_19" location="f1:1" file="f1" line="1"/>
+  <OperatorMethod id="_16" name="=" returns="_19" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
+    <Argument type="_18" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
   <Destructor id="_17" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
-  <ReferenceType id="_19" type="_9c"/>
+  <ReferenceType id="_18" type="_9c"/>
   <CvQualifiedType id="_9c" type="_9" const="1"/>
-  <ReferenceType id="_20" type="_9"/>
+  <ReferenceType id="_19" type="_9"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/using-declaration-class.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.c++11.Class-bases.xml.txt b/test/expect/gccxml.c++11.Class-bases.xml.txt
index 69666f0..56d391f 100644
--- a/test/expect/gccxml.c++11.Class-bases.xml.txt
+++ b/test/expect/gccxml.c++11.Class-bases.xml.txt
@@ -19,38 +19,38 @@
   <ReferenceType id="_10" type="_1"/>
   <ReferenceType id="_11" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
-  <OperatorMethod id="_12" name="=" returns="_25" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1">
-    <Argument type="_26" location="f1:1" file="f1" line="1"/>
+  <OperatorMethod id="_12" name="=" returns="_24" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1">
+    <Argument type="_25" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
   <Destructor id="_13" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/>
   <Constructor id="_14" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/>
   <Constructor id="_15" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1">
-    <Argument type="_26" location="f1:1" file="f1" line="1"/>
+    <Argument type="_25" location="f1:1" file="f1" line="1"/>
   </Constructor>
-  <OperatorMethod id="_16" name="=" returns="_27" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1">
-    <Argument type="_28" location="f1:2" file="f1" line="2"/>
+  <OperatorMethod id="_16" name="=" returns="_26" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1">
+    <Argument type="_27" location="f1:2" file="f1" line="2"/>
   </OperatorMethod>
   <Destructor id="_17" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"/>
   <Constructor id="_18" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"/>
   <Constructor id="_19" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1">
-    <Argument type="_28" location="f1:2" file="f1" line="2"/>
+    <Argument type="_27" location="f1:2" file="f1" line="2"/>
   </Constructor>
-  <OperatorMethod id="_20" name="=" returns="_29" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1">
-    <Argument type="_30" location="f1:3" file="f1" line="3"/>
+  <OperatorMethod id="_20" name="=" returns="_28" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1">
+    <Argument type="_29" location="f1:3" file="f1" line="3"/>
   </OperatorMethod>
   <Destructor id="_21" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1"/>
   <Constructor id="_22" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1"/>
   <Constructor id="_23" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1">
-    <Argument type="_30" location="f1:3" file="f1" line="3"/>
+    <Argument type="_29" location="f1:3" file="f1" line="3"/>
   </Constructor>
-  <ReferenceType id="_25" type="_7"/>
-  <ReferenceType id="_26" type="_7c"/>
+  <ReferenceType id="_24" type="_7"/>
+  <ReferenceType id="_25" type="_7c"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
-  <ReferenceType id="_27" type="_8"/>
-  <ReferenceType id="_28" type="_8c"/>
+  <ReferenceType id="_26" type="_8"/>
+  <ReferenceType id="_27" type="_8c"/>
   <CvQualifiedType id="_8c" type="_8" const="1"/>
-  <ReferenceType id="_29" type="_9"/>
-  <ReferenceType id="_30" type="_9c"/>
+  <ReferenceType id="_28" type="_9"/>
+  <ReferenceType id="_29" type="_9c"/>
   <CvQualifiedType id="_9c" type="_9" const="1"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-bases.cxx"/>
diff --git a/test/expect/gccxml.c++11.Class-template-bases.xml.txt b/test/expect/gccxml.c++11.Class-template-bases.xml.txt
index aaf6a75..a335a95 100644
--- a/test/expect/gccxml.c++11.Class-template-bases.xml.txt
+++ b/test/expect/gccxml.c++11.Class-template-bases.xml.txt
@@ -19,26 +19,26 @@
   <ReferenceType id="_10" type="_1"/>
   <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/>
   <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1">
-    <Argument type="_20" location="f1:1" file="f1" line="1"/>
+    <Argument type="_19" location="f1:1" file="f1" line="1"/>
   </Constructor>
-  <OperatorMethod id="_13" name="=" returns="_21" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1">
-    <Argument type="_20" location="f1:1" file="f1" line="1"/>
+  <OperatorMethod id="_13" name="=" returns="_20" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1">
+    <Argument type="_19" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
   <Destructor id="_14" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/>
   <Constructor id="_15" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"/>
   <Constructor id="_16" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1">
-    <Argument type="_22" location="f1:2" file="f1" line="2"/>
+    <Argument type="_21" location="f1:2" file="f1" line="2"/>
   </Constructor>
-  <OperatorMethod id="_17" name="=" returns="_23" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1">
-    <Argument type="_22" location="f1:2" file="f1" line="2"/>
+  <OperatorMethod id="_17" name="=" returns="_22" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1">
+    <Argument type="_21" location="f1:2" file="f1" line="2"/>
   </OperatorMethod>
   <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"/>
-  <ReferenceType id="_20" type="_7c"/>
+  <ReferenceType id="_19" type="_7c"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
-  <ReferenceType id="_21" type="_7"/>
-  <ReferenceType id="_22" type="_8c"/>
+  <ReferenceType id="_20" type="_7"/>
+  <ReferenceType id="_21" type="_8c"/>
   <CvQualifiedType id="_8c" type="_8" const="1"/>
-  <ReferenceType id="_23" type="_8"/>
+  <ReferenceType id="_22" type="_8"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-template-bases.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.c++98.Class-bases.xml.txt b/test/expect/gccxml.c++98.Class-bases.xml.txt
index 852b1c1..8d8ade5 100644
--- a/test/expect/gccxml.c++98.Class-bases.xml.txt
+++ b/test/expect/gccxml.c++98.Class-bases.xml.txt
@@ -21,37 +21,37 @@
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <Constructor id="_12" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws=""/>
   <Constructor id="_13" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
-    <Argument type="_25" location="f1:1" file="f1" line="1"/>
+    <Argument type="_24" location="f1:1" file="f1" line="1"/>
   </Constructor>
-  <OperatorMethod id="_14" name="=" returns="_26" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
-    <Argument type="_25" location="f1:1" file="f1" line="1"/>
+  <OperatorMethod id="_14" name="=" returns="_25" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
+    <Argument type="_24" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
   <Destructor id="_15" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_16" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws=""/>
   <Constructor id="_17" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
-    <Argument type="_27" location="f1:2" file="f1" line="2"/>
+    <Argument type="_26" location="f1:2" file="f1" line="2"/>
   </Constructor>
-  <OperatorMethod id="_18" name="=" returns="_28" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
-    <Argument type="_27" location="f1:2" file="f1" line="2"/>
+  <OperatorMethod id="_18" name="=" returns="_27" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
+    <Argument type="_26" location="f1:2" file="f1" line="2"/>
   </OperatorMethod>
   <Destructor id="_19" name="base_private" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_20" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws=""/>
   <Constructor id="_21" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws="">
-    <Argument type="_29" location="f1:3" file="f1" line="3"/>
+    <Argument type="_28" location="f1:3" file="f1" line="3"/>
   </Constructor>
-  <OperatorMethod id="_22" name="=" returns="_30" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws="">
-    <Argument type="_29" location="f1:3" file="f1" line="3"/>
+  <OperatorMethod id="_22" name="=" returns="_29" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1" throws="">
+    <Argument type="_28" location="f1:3" file="f1" line="3"/>
   </OperatorMethod>
   <Destructor id="_23" name="base_protected" context="_9" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1"( throws="")?/>
-  <ReferenceType id="_25" type="_7c"/>
+  <ReferenceType id="_24" type="_7c"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
-  <ReferenceType id="_26" type="_7"/>
-  <ReferenceType id="_27" type="_8c"/>
+  <ReferenceType id="_25" type="_7"/>
+  <ReferenceType id="_26" type="_8c"/>
   <CvQualifiedType id="_8c" type="_8" const="1"/>
-  <ReferenceType id="_28" type="_8"/>
-  <ReferenceType id="_29" type="_9c"/>
+  <ReferenceType id="_27" type="_8"/>
+  <ReferenceType id="_28" type="_9c"/>
   <CvQualifiedType id="_9c" type="_9" const="1"/>
-  <ReferenceType id="_30" type="_9"/>
+  <ReferenceType id="_29" type="_9"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-bases.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.c++98.Class-template-bases.xml.txt b/test/expect/gccxml.c++98.Class-template-bases.xml.txt
index a683164..3629ddb 100644
--- a/test/expect/gccxml.c++98.Class-template-bases.xml.txt
+++ b/test/expect/gccxml.c++98.Class-template-bases.xml.txt
@@ -19,26 +19,26 @@
   <ReferenceType id="_10" type="_1"/>
   <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
-    <Argument type="_20" location="f1:1" file="f1" line="1"/>
+    <Argument type="_19" location="f1:1" file="f1" line="1"/>
   </Constructor>
-  <OperatorMethod id="_13" name="=" returns="_21" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
-    <Argument type="_20" location="f1:1" file="f1" line="1"/>
+  <OperatorMethod id="_13" name="=" returns="_20" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throws="">
+    <Argument type="_19" location="f1:1" file="f1" line="1"/>
   </OperatorMethod>
   <Destructor id="_14" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_15" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
   <Constructor id="_16" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
-    <Argument type="_22" location="f1:2" file="f1" line="2"/>
+    <Argument type="_21" location="f1:2" file="f1" line="2"/>
   </Constructor>
-  <OperatorMethod id="_17" name="=" returns="_23" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
-    <Argument type="_22" location="f1:2" file="f1" line="2"/>
+  <OperatorMethod id="_17" name="=" returns="_22" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1" throws="">
+    <Argument type="_21" location="f1:2" file="f1" line="2"/>
   </OperatorMethod>
   <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
-  <ReferenceType id="_20" type="_7c"/>
+  <ReferenceType id="_19" type="_7c"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
-  <ReferenceType id="_21" type="_7"/>
-  <ReferenceType id="_22" type="_8c"/>
+  <ReferenceType id="_20" type="_7"/>
+  <ReferenceType id="_21" type="_8c"/>
   <CvQualifiedType id="_8c" type="_8" const="1"/>
-  <ReferenceType id="_23" type="_8"/>
+  <ReferenceType id="_22" type="_8"/>
   <Namespace id="_2" name="::"/>
   <File id="f1" name=".*/test/input/Class-template-bases.cxx"/>
 </GCC_XML>$