summaryrefslogtreecommitdiffstats
path: root/test/expect
diff options
context:
space:
mode:
Diffstat (limited to 'test/expect')
-rw-r--r--test/expect/gccxml.any.Class-abstract.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-base-typedef.xml.txt4
-rw-r--r--test/expect/gccxml.any.Class-forward.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-friends.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-implicit-member-access.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-implicit-member-array.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt10
-rw-r--r--test/expect/gccxml.any.Class-implicit-member-const.xml.txt8
-rw-r--r--test/expect/gccxml.any.Class-implicit-member-reference.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-implicit-members.xml.txt6
-rw-r--r--test/expect/gccxml.any.Class-member-template.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt24
-rw-r--r--test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-template-Method-return-const.xml.txt20
-rw-r--r--test/expect/gccxml.any.Class-template-constructor-template.xml.txt (renamed from test/expect/gccxml.broken.any.Class-template-constructor-template.xml.txt)5
-rw-r--r--test/expect/gccxml.any.Class-template-friends.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt10
-rw-r--r--test/expect/gccxml.any.Class-template-member-Typedef.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-template-member-template.xml.txt2
-rw-r--r--test/expect/gccxml.any.Class-template.xml.txt4
-rw-r--r--test/expect/gccxml.any.Class.xml.txt2
-rw-r--r--test/expect/gccxml.any.CvQualifiedType.xml.txt6
-rw-r--r--test/expect/gccxml.any.Field.xml.txt2
-rw-r--r--test/expect/gccxml.any.Function-Argument-default.xml.txt6
-rw-r--r--test/expect/gccxml.any.GNU-float128.xml.txt2
-rw-r--r--test/expect/gccxml.any.Method.xml.txt2
-rw-r--r--test/expect/gccxml.any.MethodType-cv.xml.txt6
-rw-r--r--test/expect/gccxml.any.Namespace-Class-members.xml.txt2
-rw-r--r--test/expect/gccxml.any.OffsetType-cv.xml.txt10
-rw-r--r--test/expect/gccxml.any.OperatorMethod.xml.txt2
-rw-r--r--test/expect/gccxml.any.Variable-in-Class.xml.txt2
-rw-r--r--test/expect/gccxml.any.Variable-init.xml.txt6
-rw-r--r--test/expect/gccxml.any.using-declaration-class.xml.txt4
-rw-r--r--test/expect/gccxml.c++11.Class-bases.xml.txt8
-rw-r--r--test/expect/gccxml.c++11.Class-template-bases.xml.txt6
-rw-r--r--test/expect/gccxml.c++98.Class-bases.xml.txt8
-rw-r--r--test/expect/gccxml.c++98.Class-template-bases.xml.txt6
39 files changed, 120 insertions, 77 deletions
diff --git a/test/expect/gccxml.any.Class-abstract.xml.txt b/test/expect/gccxml.any.Class-abstract.xml.txt
index 47b4971..336e014 100644
--- a/test/expect/gccxml.any.Class-abstract.xml.txt
+++ b/test/expect/gccxml.any.Class-abstract.xml.txt
@@ -16,7 +16,7 @@
<FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_10" type="_1"/>
<ReferenceType id="_11" type="_1c"/>
- <Namespace id="_2" name="::"/>
<CvQualifiedType id="_1c" type="_1" const="1"/>
+ <Namespace id="_2" name="::"/>
<File id="f1" name=".*/test/input/Class-abstract.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-base-typedef.xml.txt b/test/expect/gccxml.any.Class-base-typedef.xml.txt
index 49f2a64..44f11d9 100644
--- a/test/expect/gccxml.any.Class-base-typedef.xml.txt
+++ b/test/expect/gccxml.any.Class-base-typedef.xml.txt
@@ -13,6 +13,7 @@
<Destructor id="_6" name="start" context="_1" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1"( throws="")?/>
<Class id="_7" name="base" context="_2" location="f1:1" file="f1" line="1" members="_10 _11 _12 _13" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_8" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<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="")?>
@@ -23,9 +24,8 @@
</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"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<ReferenceType id="_16" type="_7"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_7c" type="_7" const="1"/>
<File id="f1" name=".*/test/input/Class-base-typedef.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-forward.xml.txt b/test/expect/gccxml.any.Class-forward.xml.txt
index b4d9d8e..1b7be75 100644
--- a/test/expect/gccxml.any.Class-forward.xml.txt
+++ b/test/expect/gccxml.any.Class-forward.xml.txt
@@ -10,8 +10,8 @@
</OperatorMethod>
<Destructor id="_6" name="start" context="_1" access="public" location="f1:7" file="f1" line="7"/>
<ReferenceType id="_7" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_8" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-forward.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-friends.xml.txt b/test/expect/gccxml.any.Class-friends.xml.txt
index 042028c..8143e8f 100644
--- a/test/expect/gccxml.any.Class-friends.xml.txt
+++ b/test/expect/gccxml.any.Class-friends.xml.txt
@@ -10,11 +10,11 @@
</OperatorMethod>
<Destructor id="_6" name="start" context="_1" access="public" location="f1:3" file="f1" line="3" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_9" type="_1c"/>
+ <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"/>
<Class id="_8" name="A" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<FundamentalType id="_12" 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-access-mutable.xml.txt b/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt
index e7b0225..9b98f75 100644
--- a/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt
@@ -16,9 +16,9 @@
</OperatorMethod>
<Field id="_10" name="data" type="_13" context="_5" access="private" location="f1:8" file="f1" line="8" offset="0" mutable="1"/>
<ReferenceType id="_11" type="_5c"/>
+ <CvQualifiedType id="_5c" type="_5" const="1"/>
<ReferenceType id="_12" type="_5"/>
<FundamentalType id="_13" name="int" size="[0-9]+" align="[0-9]+"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_5c" type="_5" const="1"/>
<File id="f1" name=".*/test/input/Class-implicit-member-access-mutable.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-implicit-member-access.xml.txt b/test/expect/gccxml.any.Class-implicit-member-access.xml.txt
index 7dd63c2..6483804 100644
--- a/test/expect/gccxml.any.Class-implicit-member-access.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-access.xml.txt
@@ -15,8 +15,8 @@
<Argument type="_10" location="f1:7" file="f1" line="7"/>
</OperatorMethod>
<ReferenceType id="_10" type="_5c"/>
+ <CvQualifiedType id="_5c" type="_5" const="1"/>
<ReferenceType id="_11" type="_5"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_5c" type="_5" const="1"/>
<File id="f1" name=".*/test/input/Class-implicit-member-access.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-implicit-member-array.xml.txt b/test/expect/gccxml.any.Class-implicit-member-array.xml.txt
index 421df50..1310ad6 100644
--- a/test/expect/gccxml.any.Class-implicit-member-array.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-array.xml.txt
@@ -12,9 +12,9 @@
<Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<ArrayType id="_8" min="0" max="1" type="_11"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_10" type="_1"/>
<FundamentalType id="_11" name="int" size="[0-9]+" align="[0-9]+"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-implicit-member-array.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 14a5495..2bf091b 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
@@ -10,17 +10,17 @@
<Destructor id="_5" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throws="")?/>
<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"/>
- <Field id="_8" name="data" type="_14c" context="_6" access="protected" location="f1:3" file="f1" line="3" offset="0"/>
+ <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"/>
<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"/>
</Constructor>
<Destructor id="_11" name="base" context="_6" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
- <CvQualifiedType id="_14c" type="_14" const="1"/>
- <FundamentalType id="_14" name="int" size="[0-9]+" align="[0-9]+"/>
+ <FundamentalType id="_13" name="int" size="[0-9]+" align="[0-9]+"/>
+ <CvQualifiedType id="_13c" type="_13" const="1"/>
<ReferenceType id="_15" type="_6c"/>
- <Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<CvQualifiedType id="_6c" type="_6" const="1"/>
+ <Namespace id="_2" name="::"/>
<File id="f1" name=".*/test/input/Class-implicit-member-bad-base.cxx"/>
</GCC_XML>$
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 d240fdf..99d41d8 100644
--- a/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt
@@ -1,16 +1,16 @@
^<\?xml version="1.0"\?>
<GCC_XML[^>]*>
<Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6" size="[0-9]+" align="[0-9]+"/>
- <Field id="_3" name="data" type="_8c" context="_1" access="private" location="f1:2" file="f1" line="2" offset="0"/>
+ <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"/>
</Constructor>
<Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
- <CvQualifiedType id="_8c" type="_8" const="1"/>
- <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/>
+ <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<ReferenceType id="_9" type="_1c"/>
- <Namespace id="_2" name="::"/>
<CvQualifiedType id="_1c" type="_1" const="1"/>
+ <Namespace id="_2" name="::"/>
<File id="f1" name=".*/test/input/Class-implicit-member-const.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt b/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt
index 325c063..e9d21a0 100644
--- a/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt
@@ -9,8 +9,8 @@
<Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_7" type="_9"/>
<ReferenceType id="_8" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<Namespace id="_2" name="::"/>
<FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-implicit-member-reference.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-implicit-members.xml.txt b/test/expect/gccxml.any.Class-implicit-members.xml.txt
index 4c077e4..6a2115f 100644
--- a/test/expect/gccxml.any.Class-implicit-members.xml.txt
+++ b/test/expect/gccxml.any.Class-implicit-members.xml.txt
@@ -5,16 +5,16 @@
<Argument name="x" type="_8" location="f1:2" file="f1" line="2"/>
</Method>
<Constructor id="_4" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
- <Constructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?( throws="")?>
+ <Constructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
<Argument type="_8" location="f1:1" file="f1" line="1"/>
</Constructor>
- <OperatorMethod id="_6" name="=" returns="_9" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?( throws="")?>
+ <OperatorMethod id="_6" name="=" returns="_9" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?>
<Argument type="_8" location="f1:1" file="f1" line="1"/>
</OperatorMethod>
<Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_8" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_9" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-implicit-members.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-member-template.xml.txt b/test/expect/gccxml.any.Class-member-template.xml.txt
index dcc4bf9..01bf425 100644
--- a/test/expect/gccxml.any.Class-member-template.xml.txt
+++ b/test/expect/gccxml.any.Class-member-template.xml.txt
@@ -14,8 +14,8 @@
<Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_10" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-member-template.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt b/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt
index 7c7fcf5..a3d8c18 100644
--- a/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt
+++ b/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt
@@ -15,8 +15,8 @@
<Destructor id="_8" name="start" context="_1" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throws="")?/>
<FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_10" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_11" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-partial-template-member-Typedef.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt b/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt
new file mode 100644
index 0000000..c4e288c
--- /dev/null
+++ b/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt
@@ -0,0 +1,24 @@
+^<\?xml version="1.0"\?>
+<GCC_XML[^>]*>
+ <Class id="_1" name="start&lt;const int&gt;" context="_2" location="f1:4" file="f1" line="4" members="_3 _4 _5 _6 _7" size="[0-9]+" align="[0-9]+"/>
+ <Method id="_3" name="method" returns="_8" context="_1" access="private" location="f1:2" file="f1" line="2">
+ <Argument type="_9" location="f1:2" file="f1" line="2"/>
+ </Method>
+ <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"/>
+ </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>
+ <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="void" size="[0-9]+" align="[0-9]+"/>
+ <ReferenceType id="_9" type="_12c"/>
+ <ReferenceType id="_10" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
+ <ReferenceType id="_11" type="_1"/>
+ <CvQualifiedType id="_12c" type="_12" const="1"/>
+ <Namespace id="_2" name="::"/>
+ <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/>
+ <File id="f1" name=".*/test/input/Class-template-Method-Argument-const.cxx"/>
+</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt b/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt
index 033e39d..b5dd76c 100644
--- a/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt
+++ b/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt
@@ -14,8 +14,8 @@
<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]+"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_10" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-template-Method-Argument-default.cxx"/>
</GCC_XML>$
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
new file mode 100644
index 0000000..5bf29e2
--- /dev/null
+++ b/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt
@@ -0,0 +1,20 @@
+^<\?xml version="1.0"\?>
+<GCC_XML[^>]*>
+ <Class id="_1" name="start&lt;const int&gt;" context="_2" location="f1:4" file="f1" line="4" members="_3 _4 _5 _6 _7" size="[0-9]+" align="[0-9]+"/>
+ <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"/>
+ </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>
+ <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"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
+ <ReferenceType id="_11" 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.broken.any.Class-template-constructor-template.xml.txt b/test/expect/gccxml.any.Class-template-constructor-template.xml.txt
index 3fa83ec..b9a8e1f 100644
--- a/test/expect/gccxml.broken.any.Class-template-constructor-template.xml.txt
+++ b/test/expect/gccxml.any.Class-template-constructor-template.xml.txt
@@ -12,10 +12,9 @@
</OperatorMethod>
<Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_7" type="_1c"/>
- <ReferenceType id="_8" type="_1c"/>(broken: duplicate ReferenceType)?
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
+ <ReferenceType id="_8" type="_1c"/>
<ReferenceType id="_9" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-template-constructor-template.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 ae87767..061a913 100644
--- a/test/expect/gccxml.any.Class-template-friends.xml.txt
+++ b/test/expect/gccxml.any.Class-template-friends.xml.txt
@@ -10,13 +10,13 @@
</OperatorMethod>
<Destructor id="_6" name="start" context="_1" access="public" location="f1:8" file="f1" line="8" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_9" type="_1c"/>
+ <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>
<Class id="_8" name="A&lt;int&gt;" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<FundamentalType id="_12" 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 a31207f..3348184 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
@@ -1,8 +1,8 @@
^<\?xml version="1.0"\?>
<GCC_XML[^>]*>
<Class id="_1" name="start&lt;const int&gt;" context="_2" location="f1:6" file="f1" line="6" members="_3 _4 _5 _6 _7 _8" size="[0-9]+" align="[0-9]+"/>
- <Typedef id="_3" name="IntConst" type="_10c" context="_1" access="private" location="f1:2" file="f1" line="2"/>
- <Method id="_4" name="method" returns="_10c" context="_1" access="public" location="f1:4" file="f1" line="4">
+ <Typedef id="_3" name="IntConst" type="_9c" context="_1" access="private" location="f1:2" file="f1" line="2"/>
+ <Method id="_4" name="method" returns="_9c" context="_1" access="public" location="f1:4" file="f1" line="4">
<Argument type="_3" location="f1:4" file="f1" line="4"/>
</Method>
<Constructor id="_5" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throws="")?/>
@@ -13,11 +13,11 @@
<Argument type="_11" 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="")?/>
- <CvQualifiedType id="_10c" type="_10" const="1"/>
- <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/>
+ <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
+ <CvQualifiedType id="_9c" type="_9" const="1"/>
<ReferenceType id="_11" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_12" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-template-member-Typedef-const.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt b/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt
index 7aea3ff..d687249 100644
--- a/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt
+++ b/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt
@@ -15,8 +15,8 @@
<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]+"/>
<ReferenceType id="_10" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_11" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-template-member-Typedef.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template-member-template.xml.txt b/test/expect/gccxml.any.Class-template-member-template.xml.txt
index 93f59a5..b7f565e 100644
--- a/test/expect/gccxml.any.Class-template-member-template.xml.txt
+++ b/test/expect/gccxml.any.Class-template-member-template.xml.txt
@@ -15,8 +15,8 @@
<FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/>
<FundamentalType id="_9" name="char" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_10" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_11" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class-template-member-template.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-template.xml.txt b/test/expect/gccxml.any.Class-template.xml.txt
index f8d5446..ccec63f 100644
--- a/test/expect/gccxml.any.Class-template.xml.txt
+++ b/test/expect/gccxml.any.Class-template.xml.txt
@@ -20,11 +20,11 @@
</OperatorMethod>
<Destructor id="_12" name="start" context="_3" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_13" type="_2c"/>
+ <CvQualifiedType id="_2c" type="_2" const="1"/>
<ReferenceType id="_14" type="_2"/>
<ReferenceType id="_15" type="_3c"/>
+ <CvQualifiedType id="_3c" type="_3" const="1"/>
<ReferenceType id="_16" type="_3"/>
<Namespace id="_4" name="::"/>
- <CvQualifiedType id="_2c" type="_2" const="1"/>
- <CvQualifiedType id="_3c" type="_3" const="1"/>
<File id="f1" name=".*/test/input/Class-template.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Class.xml.txt b/test/expect/gccxml.any.Class.xml.txt
index 9dea0cc..6c87c6f 100644
--- a/test/expect/gccxml.any.Class.xml.txt
+++ b/test/expect/gccxml.any.Class.xml.txt
@@ -10,8 +10,8 @@
</OperatorMethod>
<Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<ReferenceType id="_7" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_8" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Class.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.CvQualifiedType.xml.txt b/test/expect/gccxml.any.CvQualifiedType.xml.txt
index a6b0ec8..a360ee6 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="_3c" context="_4" location="f1:1" file="f1" line="1"/>
- <CvQualifiedType id="_3c" type="_3" const="1"/>
- <FundamentalType id="_3" name="int" size="[0-9]+" align="[0-9]+"/>
+ <Typedef id="_1" name="start" type="_2c" context="_4" 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="::"/>
<File id="f1" name=".*/test/input/CvQualifiedType.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Field.xml.txt b/test/expect/gccxml.any.Field.xml.txt
index 269929c..c967c77 100644
--- a/test/expect/gccxml.any.Field.xml.txt
+++ b/test/expect/gccxml.any.Field.xml.txt
@@ -15,8 +15,8 @@
<FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/>
<FundamentalType id="_11" name="unsigned int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_12" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_13" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Field.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Function-Argument-default.xml.txt b/test/expect/gccxml.any.Function-Argument-default.xml.txt
index d9ffd40..ce29f8d 100644
--- a/test/expect/gccxml.any.Function-Argument-default.xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-default.xml.txt
@@ -6,9 +6,9 @@
</Function>
<FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/>
<FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/>
- <PointerType id="_5" type="_7c"/>
+ <PointerType id="_5" type="_6c"/>
+ <CvQualifiedType id="_6c" type="_6" const="1"/>
<Namespace id="_3" name="::"/>
- <CvQualifiedType id="_7c" type="_7" const="1"/>
- <FundamentalType id="_7" name="char" size="[0-9]+" align="[0-9]+"/>
+ <FundamentalType id="_6" name="char" size="[0-9]+" align="[0-9]+"/>
<File id="f1" name=".*/test/input/Function-Argument-default.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.GNU-float128.xml.txt b/test/expect/gccxml.any.GNU-float128.xml.txt
index 43b5411..d21678f 100644
--- a/test/expect/gccxml.any.GNU-float128.xml.txt
+++ b/test/expect/gccxml.any.GNU-float128.xml.txt
@@ -16,10 +16,10 @@
<Destructor id="_9" context="_4" access="public" location="f0:0" file="f0" line="0" inline="1" artificial="1"( throws="")?/>
<ArrayType id="_10" min="0" max="15" type="_13"/>
<ReferenceType id="_11" type="_4c"/>
+ <CvQualifiedType id="_4c" type="_4" const="1"/>
<ReferenceType id="_12" type="_4"/>
<FundamentalType id="_13" name="char" size="[0-9]+" align="[0-9]+"/>
<Namespace id="_3" name="::"/>
- <CvQualifiedType id="_4c" type="_4" const="1"/>
<File id="f0" name="&lt;builtin&gt;"/>
<File id="f1" name=".*/test/input/GNU-float128.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Method.xml.txt b/test/expect/gccxml.any.Method.xml.txt
index 5821218..ca938e8 100644
--- a/test/expect/gccxml.any.Method.xml.txt
+++ b/test/expect/gccxml.any.Method.xml.txt
@@ -14,8 +14,8 @@
<Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_10" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Method.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.MethodType-cv.xml.txt b/test/expect/gccxml.any.MethodType-cv.xml.txt
index 5c43a24..a2f11bd 100644
--- a/test/expect/gccxml.any.MethodType-cv.xml.txt
+++ b/test/expect/gccxml.any.MethodType-cv.xml.txt
@@ -1,8 +1,8 @@
^<\?xml version="1.0"\?>
<GCC_XML[^>]*>
- <Typedef id="_1" name="start" type="_3cv" context="_4" location="f1:2" file="f1" line="2"/>
- <CvQualifiedType id="_3cv" type="_3" const="1" volatile="1"/>
- <PointerType id="_3" type="_5"/>
+ <Typedef id="_1" name="start" type="_2cv" context="_4" location="f1:2" file="f1" line="2"/>
+ <PointerType id="_2" type="_5"/>
+ <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"/>
diff --git a/test/expect/gccxml.any.Namespace-Class-members.xml.txt b/test/expect/gccxml.any.Namespace-Class-members.xml.txt
index 9f38370..bda8d84 100644
--- a/test/expect/gccxml.any.Namespace-Class-members.xml.txt
+++ b/test/expect/gccxml.any.Namespace-Class-members.xml.txt
@@ -13,8 +13,8 @@
<Destructor id="_8" name="A" context="_3" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throws="")?/>
<FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_10" type="_3c"/>
+ <CvQualifiedType id="_3c" type="_3" const="1"/>
<ReferenceType id="_11" type="_3"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_3c" type="_3" const="1"/>
<File id="f1" name=".*/test/input/Namespace-Class-members.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.OffsetType-cv.xml.txt b/test/expect/gccxml.any.OffsetType-cv.xml.txt
index 15c35ac..16e70a5 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="_3cv" context="_4" location="f1:2" file="f1" line="2"/>
- <CvQualifiedType id="_3cv" type="_3" const="1" volatile="1"/>
- <OffsetType id="_3" basetype="_5" type="_7cv"/>
+ <Typedef id="_1" name="start" type="_2cv" context="_4" location="f1:2" file="f1" line="2"/>
+ <OffsetType id="_2" basetype="_5" type="_6cv"/>
+ <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"/>
- <CvQualifiedType id="_7cv" type="_7" const="1" volatile="1"/>
- <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/>
+ <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/>
+ <CvQualifiedType id="_6cv" type="_6" const="1" volatile="1"/>
<Namespace id="_4" name="::"/>
<File id="f1" name=".*/test/input/OffsetType-cv.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.OperatorMethod.xml.txt b/test/expect/gccxml.any.OperatorMethod.xml.txt
index b04b30a..b72b2cd 100644
--- a/test/expect/gccxml.any.OperatorMethod.xml.txt
+++ b/test/expect/gccxml.any.OperatorMethod.xml.txt
@@ -15,7 +15,7 @@
<ReferenceType id="_8" type="_1"/>
<FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_10" type="_1c"/>
- <Namespace id="_2" name="::"/>
<CvQualifiedType id="_1c" type="_1" const="1"/>
+ <Namespace id="_2" name="::"/>
<File id="f1" name=".*/test/input/OperatorMethod.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Variable-in-Class.xml.txt b/test/expect/gccxml.any.Variable-in-Class.xml.txt
index e89800d..12e8056 100644
--- a/test/expect/gccxml.any.Variable-in-Class.xml.txt
+++ b/test/expect/gccxml.any.Variable-in-Class.xml.txt
@@ -12,8 +12,8 @@
<Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throws="")?/>
<FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<ReferenceType id="_10" type="_1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
<File id="f1" name=".*/test/input/Variable-in-Class.cxx"/>
</GCC_XML>$
diff --git a/test/expect/gccxml.any.Variable-init.xml.txt b/test/expect/gccxml.any.Variable-init.xml.txt
index 6659b64..6061dc1 100644
--- a/test/expect/gccxml.any.Variable-init.xml.txt
+++ b/test/expect/gccxml.any.Variable-init.xml.txt
@@ -4,9 +4,9 @@
<Variable id="_3" name="var_int" type="_5" init="123" context="_1" location="f1:2" file="f1" line="2"/>
<Variable id="_4" name="var_str" type="_6" init="&quot;abc&quot;" context="_1" location="f1:3" file="f1" line="3"/>
<FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/>
- <PointerType id="_6" type="_8c"/>
+ <PointerType id="_6" type="_7c"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_8c" type="_8" const="1"/>
- <FundamentalType id="_8" name="char" size="[0-9]+" align="[0-9]+"/>
+ <FundamentalType id="_7" name="char" size="[0-9]+" align="[0-9]+"/>
<File id="f1" name=".*/test/input/Variable-init.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 abcc136..9669b01 100644
--- a/test/expect/gccxml.any.using-declaration-class.xml.txt
+++ b/test/expect/gccxml.any.using-declaration-class.xml.txt
@@ -21,6 +21,7 @@
<FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/>
<FundamentalType id="_11" name="char" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_12" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<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="")?>
@@ -31,9 +32,8 @@
</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"/>
+ <CvQualifiedType id="_9c" type="_9" const="1"/>
<ReferenceType id="_20" type="_9"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_9c" type="_9" const="1"/>
<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 db478dd..69666f0 100644
--- a/test/expect/gccxml.c++11.Class-bases.xml.txt
+++ b/test/expect/gccxml.c++11.Class-bases.xml.txt
@@ -18,6 +18,7 @@
<Class id="_9" name="base_protected" context="_2" location="f1:3" file="f1" line="3" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/>
<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>
@@ -44,14 +45,13 @@
</Constructor>
<ReferenceType id="_25" type="_7"/>
<ReferenceType id="_26" type="_7c"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<ReferenceType id="_27" type="_8"/>
<ReferenceType id="_28" type="_8c"/>
+ <CvQualifiedType id="_8c" type="_8" const="1"/>
<ReferenceType id="_29" type="_9"/>
<ReferenceType id="_30" type="_9c"/>
- <Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_7c" type="_7" const="1"/>
- <CvQualifiedType id="_8c" type="_8" const="1"/>
<CvQualifiedType id="_9c" type="_9" const="1"/>
+ <Namespace id="_2" name="::"/>
<File id="f1" name=".*/test/input/Class-bases.cxx"/>
</GCC_XML>$
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 1a7a047..aaf6a75 100644
--- a/test/expect/gccxml.c++11.Class-template-bases.xml.txt
+++ b/test/expect/gccxml.c++11.Class-template-bases.xml.txt
@@ -15,6 +15,7 @@
<Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/>
<Class id="_8" name="dependent_base&lt;int&gt;" context="_2" location="f1:2" file="f1" line="2" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<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">
@@ -33,12 +34,11 @@
</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"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<ReferenceType id="_21" type="_7"/>
<ReferenceType id="_22" type="_8c"/>
+ <CvQualifiedType id="_8c" type="_8" const="1"/>
<ReferenceType id="_23" type="_8"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_7c" type="_7" const="1"/>
- <CvQualifiedType id="_8c" type="_8" const="1"/>
<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 1ec7843..852b1c1 100644
--- a/test/expect/gccxml.c++98.Class-bases.xml.txt
+++ b/test/expect/gccxml.c++98.Class-bases.xml.txt
@@ -18,6 +18,7 @@
<Class id="_9" name="base_protected" context="_2" location="f1:3" file="f1" line="3" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_10" type="_1"/>
<ReferenceType id="_11" type="_1c"/>
+ <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"/>
@@ -43,15 +44,14 @@
</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"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<ReferenceType id="_26" type="_7"/>
<ReferenceType id="_27" type="_8c"/>
+ <CvQualifiedType id="_8c" type="_8" const="1"/>
<ReferenceType id="_28" type="_8"/>
<ReferenceType id="_29" type="_9c"/>
+ <CvQualifiedType id="_9c" type="_9" const="1"/>
<ReferenceType id="_30" type="_9"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_7c" type="_7" const="1"/>
- <CvQualifiedType id="_8c" type="_8" const="1"/>
- <CvQualifiedType id="_9c" type="_9" const="1"/>
<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 1ad68ab..a683164 100644
--- a/test/expect/gccxml.c++98.Class-template-bases.xml.txt
+++ b/test/expect/gccxml.c++98.Class-template-bases.xml.txt
@@ -15,6 +15,7 @@
<Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/>
<Class id="_8" name="dependent_base&lt;int&gt;" context="_2" location="f1:2" file="f1" line="2" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/>
<ReferenceType id="_9" type="_1c"/>
+ <CvQualifiedType id="_1c" type="_1" const="1"/>
<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="">
@@ -33,12 +34,11 @@
</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"/>
+ <CvQualifiedType id="_7c" type="_7" const="1"/>
<ReferenceType id="_21" type="_7"/>
<ReferenceType id="_22" type="_8c"/>
+ <CvQualifiedType id="_8c" type="_8" const="1"/>
<ReferenceType id="_23" type="_8"/>
<Namespace id="_2" name="::"/>
- <CvQualifiedType id="_1c" type="_1" const="1"/>
- <CvQualifiedType id="_7c" type="_7" const="1"/>
- <CvQualifiedType id="_8c" type="_8" const="1"/>
<File id="f1" name=".*/test/input/Class-template-bases.cxx"/>
</GCC_XML>$