Output: Order queue deterministically by node index

Use a set<> instead of a queue<> to represent the output node queue.
Order nodes by the dump node index.  The index is the same as the order
of encounter so for complete nodes this should normally be the same
order as before.  However, QueueIncompleteDumpNodes previously ordered
based on memory position which is not deterministic.  Use the node index
to get a consistent order across runs.  Fix the expected output for test
cases that changed the order of incomplete nodes.

8 files changed, 8 insertions, 8 deletions

diff --git a/test/expect/gccxml.any.Class-base-typedef.xml.txt b/test/expect/gccxml.any.Class-base-typedef.xml.txt
index 9188b97..c0b54fb 100644
--- a/test/expect/gccxml.any.Class-base-typedef.xml.txt
+++ b/test/expect/gccxml.any.Class-base-typedef.xml.txt
@@ -25,7 +25,7 @@
   <ReferenceType id="_15" type="_7c"/>
   <ReferenceType id="_16" type="_7"/>
   <Namespace id="_2" name="::"/>
-  <CvQualifiedType id="_7c" type="_7" const="1"/>
   <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-bases.xml.txt b/test/expect/gccxml.any.Class-bases.xml.txt
index f650a84..d87f1fa 100644
--- a/test/expect/gccxml.any.Class-bases.xml.txt
+++ b/test/expect/gccxml.any.Class-bases.xml.txt
@@ -49,9 +49,9 @@
   <ReferenceType id="_29" type="_9c"/>
   <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"/>
-  <CvQualifiedType id="_1c" type="_1" const="1"/>
   <File id="f1" name=".*/test/input/Class-bases.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.Class-friends.xml.txt b/test/expect/gccxml.any.Class-friends.xml.txt
index 8a94e77..f434623 100644
--- a/test/expect/gccxml.any.Class-friends.xml.txt
+++ b/test/expect/gccxml.any.Class-friends.xml.txt
@@ -12,8 +12,8 @@
   <ReferenceType id="_9" type="_1c"/>
   <ReferenceType id="_10" type="_1"/>
   <Namespace id="_2" name="::"/>
-  <Class id="_8" name="A" context="_2" location="f1:1" file="f1" line="1"/>
   <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"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <FundamentalType id="_12" name="void"/>
   <File id="f1" name=".*/test/input/Class-friends.cxx"/>
diff --git a/test/expect/gccxml.any.Class-template-bases.xml.txt b/test/expect/gccxml.any.Class-template-bases.xml.txt
index 332f7c0..25eb461 100644
--- a/test/expect/gccxml.any.Class-template-bases.xml.txt
+++ b/test/expect/gccxml.any.Class-template-bases.xml.txt
@@ -37,8 +37,8 @@
   <ReferenceType id="_22" type="_8c"/>
   <ReferenceType id="_23" type="_8"/>
   <Namespace id="_2" name="::"/>
-  <CvQualifiedType id="_7c" type="_7" const="1"/>
   <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.any.Class-template-friends.xml.txt b/test/expect/gccxml.any.Class-template-friends.xml.txt
index 8bcd543..084850c 100644
--- a/test/expect/gccxml.any.Class-template-friends.xml.txt
+++ b/test/expect/gccxml.any.Class-template-friends.xml.txt
@@ -12,10 +12,10 @@
   <ReferenceType id="_9" type="_1c"/>
   <ReferenceType id="_10" type="_1"/>
   <Namespace id="_2" name="::"/>
-  <Class id="_8" name="A&lt;int&gt;" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/>
   <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"/>
   <File id="f1" name=".*/test/input/Class-template-friends.cxx"/>
diff --git a/test/expect/gccxml.any.Function-Argument-default.xml.txt b/test/expect/gccxml.any.Function-Argument-default.xml.txt
index 8160551..ecd9c65 100644
--- a/test/expect/gccxml.any.Function-Argument-default.xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-default.xml.txt
@@ -8,7 +8,7 @@
   <FundamentalType id="_4" name="int"/>
   <PointerType id="_5" type="_7c"/>
   <Namespace id="_3" name="::"/>
-  <FundamentalType id="_7" name="char"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
+  <FundamentalType id="_7" name="char"/>
   <File id="f1" name=".*/test/input/Function-Argument-default.cxx"/>
 </GCC_XML>$
diff --git a/test/expect/gccxml.any.Variable-init.xml.txt b/test/expect/gccxml.any.Variable-init.xml.txt
index 7eb4cf5..ac3c581 100644
--- a/test/expect/gccxml.any.Variable-init.xml.txt
+++ b/test/expect/gccxml.any.Variable-init.xml.txt
@@ -6,7 +6,7 @@
   <FundamentalType id="_5" name="int"/>
   <PointerType id="_6" type="_8c"/>
   <Namespace id="_2" name="::"/>
-  <FundamentalType id="_8" name="char"/>
   <CvQualifiedType id="_8c" type="_8" const="1"/>
+  <FundamentalType id="_8" name="char"/>
   <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 4ba114d..37f43d1 100644
--- a/test/expect/gccxml.any.using-declaration-class.xml.txt
+++ b/test/expect/gccxml.any.using-declaration-class.xml.txt
@@ -33,7 +33,7 @@
   <ReferenceType id="_19" type="_9c"/>
   <ReferenceType id="_20" type="_9"/>
   <Namespace id="_2" name="::"/>
-  <CvQualifiedType id="_9c" type="_9" const="1"/>
   <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>$